# HG changeset patch # User Claus Gittinger # Date 1218015274 -7200 # Node ID e266cdde958adf0d6713872a75d3e1e0d3338036 # Parent 48b9b4e7ed0837ab8c0934f1c5f0ec0a39274bd4 *** empty log message *** diff -r 48b9b4e7ed08 -r e266cdde958a RadioButton.st --- a/RadioButton.st Tue Aug 05 15:25:21 2008 +0200 +++ b/RadioButton.st Wed Aug 06 11:34:34 2008 +0200 @@ -391,99 +391,69 @@ roundOffForm RoundOffForm isNil ifTrue:[ - RoundOffForm := Form - width:16 - height:16 - fromArray:#[ - -"/ 2r00000011 2r10000000 -"/ 2r00001111 2r11100000 -"/ 2r00111100 2r01111000 -"/ 2r00110000 2r00011000 -"/ 2r01100000 2r00001100 -"/ 2r01100000 2r00001100 -"/ 2r11000000 2r00000110 -"/ 2r11000000 2r00000110 -"/ 2r11000000 2r00000110 -"/ 2r01100000 2r00001100 -"/ 2r01100000 2r00001100 -"/ 2r00110000 2r00011000 -"/ 2r00111100 2r01111000 -"/ 2r00001111 2r11100000 -"/ 2r00000011 2r10000000 -"/ 2r00000000 2r00000000 - - 2r00000011 2r10000000 - 2r00001100 2r01100000 - 2r00010000 2r00010000 - 2r00100000 2r00001000 - 2r01000000 2r00000100 - 2r01000000 2r00000100 - 2r10000000 2r00000010 - 2r10000000 2r00000010 - 2r10000000 2r00000010 - 2r01000000 2r00000100 - 2r01000000 2r00000100 - 2r00100000 2r00001000 - 2r00010000 2r00010000 - 2r00001100 2r01100000 - 2r00000011 2r10000000 - 2r00000000 2r00000000 - ]. - RoundOffForm := RoundOffForm onDevice:Display. + self updateStyleCache. ]. ^ RoundOffForm +! - "Created: / 3.11.1997 / 12:41:13 / cg" - "Modified: / 30.7.1998 / 21:33:03 / cg" +roundOffForm_old + ^ Form + width:16 + height:16 + fromArray:#[ + 2r00000011 2r10000000 + 2r00001100 2r01100000 + 2r00010000 2r00010000 + 2r00100000 2r00001000 + 2r01000000 2r00000100 + 2r01000000 2r00000100 + 2r10000000 2r00000010 + 2r10000000 2r00000010 + 2r10000000 2r00000010 + 2r01000000 2r00000100 + 2r01000000 2r00000100 + 2r00100000 2r00001000 + 2r00010000 2r00010000 + 2r00001100 2r01100000 + 2r00000011 2r10000000 + 2r00000000 2r00000000 + ]. ! roundOnForm RoundOnForm isNil ifTrue:[ - RoundOnForm := Form - width:16 - height:16 - fromArray:#[ - -"/ 2r00000000 2r00000000 -"/ 2r00000000 2r00000000 -"/ 2r00000000 2r00000000 -"/ 2r00000111 2r11000000 -"/ 2r00001111 2r11100000 -"/ 2r00011111 2r11110000 -"/ 2r00011111 2r11110000 -"/ 2r00011111 2r11110000 -"/ 2r00011111 2r11110000 -"/ 2r00011111 2r11110000 -"/ 2r00001111 2r11100000 -"/ 2r00000111 2r11000000 -"/ 2r00000000 2r00000000 -"/ 2r00000000 2r00000000 -"/ 2r00000000 2r00000000 -"/ 2r00000000 2r00000000 - - 2r00000000 2r00000000 - 2r00000000 2r00000000 - 2r00000000 2r00000000 - 2r00000000 2r00000000 - 2r00000011 2r10000000 - 2r00000111 2r11000000 - 2r00001111 2r11100000 - 2r00001111 2r11100000 - 2r00001111 2r11100000 - 2r00000111 2r11000000 - 2r00000011 2r10000000 - 2r00000000 2r00000000 - 2r00000000 2r00000000 - 2r00000000 2r00000000 - 2r00000000 2r00000000 - 2r00000000 2r00000000 - ]. - RoundOnForm := RoundOnForm onDevice:Display. + self updateStyleCache. ]. ^ RoundOnForm - "RoundOnForm := nil. self updateStyleCache" + " + RoundOnForm := nil. + self updateStyleCache + " +! + +roundOnForm_old + ^ Form + width:16 + height:16 + fromArray:#[ + 2r00000000 2r00000000 + 2r00000000 2r00000000 + 2r00000000 2r00000000 + 2r00000000 2r00000000 + 2r00000011 2r10000000 + 2r00000111 2r11000000 + 2r00001111 2r11100000 + 2r00001111 2r11100000 + 2r00001111 2r11100000 + 2r00000111 2r11000000 + 2r00000011 2r10000000 + 2r00000000 2r00000000 + 2r00000000 2r00000000 + 2r00000000 2r00000000 + 2r00000000 2r00000000 + 2r00000000 2r00000000 + ]. ! updateStyleCache @@ -530,6 +500,7 @@ ifFalse:[ self radioOnIcon_w95 ] ]. f notNil ifTrue:[ + "/ RoundOnForm := self roundOnForm_old. RoundOnForm := f onDevice:Display ]. @@ -540,6 +511,7 @@ f := StyleSheet at:#'radioButton.passiveImage'. ]. f isNil ifTrue:[ + "/ RoundOffForm := self roundOffForm_old. RoundOffForm := StyleSheet isWindowsXPStyle ifTrue:[ self radioOffIcon_xp ] ifFalse:[ self radioOffIcon_w95 ] @@ -908,5 +880,5 @@ !RadioButton class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/RadioButton.st,v 1.38 2008-08-05 13:25:21 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/RadioButton.st,v 1.39 2008-08-06 09:34:34 cg Exp $' ! !