--- a/ChckTggle.st Wed Feb 21 01:37:00 1996 +0100
+++ b/ChckTggle.st Wed Feb 21 18:02:31 1996 +0100
@@ -11,12 +11,12 @@
"
Toggle subclass:#CheckToggle
- instanceVariableNames:''
- classVariableNames:'DefaultCheckForm DefaultCheckColor DefaultActiveFGColor
+ instanceVariableNames:''
+ classVariableNames:'DefaultCheckForm DefaultCheckColor DefaultActiveFGColor
DefaultActiveBGColor DefaultFGColor DefaultBGColor
DefaultActiveLevel DefaultPassiveLevel DefaultBorderWidth'
- poolDictionaries:''
- category:'Views-Interactors'
+ poolDictionaries:''
+ category:'Views-Interactors'
!
!CheckToggle class methodsFor:'documentation'!
@@ -214,7 +214,7 @@
!
updateStyleCache
- |checkFileName bits|
+ |checkFileName bits checkStyle|
DefaultCheckColor := StyleSheet colorAt:'checkToggleCheckColor'.
DefaultFGColor := StyleSheet colorAt:'checkToggleForegroundColor'.
@@ -228,48 +228,68 @@
DefaultCheckForm := nil.
checkFileName := StyleSheet at:'checkToggleBitmapFile' default:'CheckOn.xbm'.
checkFileName notNil ifTrue:[
- DefaultCheckForm := Form fromFile:checkFileName
- resolution:100
- on:Display.
+ DefaultCheckForm := Form fromFile:checkFileName
+ resolution:100
+ on:Display.
].
DefaultCheckForm isNil ifTrue:[
- (StyleSheet at:'checkToggleStyle' default:#check) == #cross ifTrue:[
- bits := #[2r10000000 2r00000001
- 2r01000000 2r00000010
- 2r00100000 2r00000100
- 2r00010000 2r00001000
- 2r00001000 2r00010000
- 2r00000100 2r00100000
- 2r00000010 2r01000000
- 2r00000001 2r10000000
- 2r00000001 2r10000000
- 2r00000010 2r01000000
- 2r00000100 2r00100000
- 2r00001000 2r00010000
- 2r00010000 2r00001000
- 2r00100000 2r00000100
- 2r01000000 2r00000010
- 2r10000000 2r00000001]
+ checkStyle := StyleSheet at:'checkToggleStyle' default:#check.
+ checkStyle == #cross ifTrue:[
+ bits := #[2r10000000 2r00000001
+ 2r01000000 2r00000010
+ 2r00100000 2r00000100
+ 2r00010000 2r00001000
+ 2r00001000 2r00010000
+ 2r00000100 2r00100000
+ 2r00000010 2r01000000
+ 2r00000001 2r10000000
+ 2r00000001 2r10000000
+ 2r00000010 2r01000000
+ 2r00000100 2r00100000
+ 2r00001000 2r00010000
+ 2r00010000 2r00001000
+ 2r00100000 2r00000100
+ 2r01000000 2r00000010
+ 2r10000000 2r00000001]
- ] ifFalse:[
- bits := #[2r00000000 2r00000000
- 2r00000000 2r00000010
- 2r00000000 2r00000010
- 2r00000000 2r00000100
- 2r00000000 2r00000100
- 2r00000000 2r00001000
- 2r00000000 2r00001000
- 2r00000000 2r00010000
- 2r01000000 2r00110000
- 2r00100000 2r01100000
- 2r00011000 2r01100000
- 2r00001110 2r11000000
- 2r00000111 2r11000000
- 2r00000011 2r10000000
- 2r00000001 2r10000000
- 2r00000000 2r00000000]
- ].
- DefaultCheckForm := Form width:16 height:16 fromArray:bits on:Display
+ ] ifFalse:[
+ checkStyle == #fatcross ifTrue:[
+ bits := #[2r11000000 2r00000011
+ 2r11100000 2r00000111
+ 2r01110000 2r00001110
+ 2r00111000 2r00011100
+ 2r00011100 2r00111000
+ 2r00001110 2r01110000
+ 2r00000111 2r11100000
+ 2r00000011 2r11000000
+ 2r00000011 2r11000000
+ 2r00000111 2r11100000
+ 2r00001110 2r01110000
+ 2r00011100 2r00111000
+ 2r00111000 2r00011100
+ 2r01110000 2r00001110
+ 2r11100000 2r00000111
+ 2r11000000 2r00000011]
+ ] ifFalse:[
+ bits := #[2r00000000 2r00000000
+ 2r00000000 2r00000010
+ 2r00000000 2r00000010
+ 2r00000000 2r00000100
+ 2r00000000 2r00000100
+ 2r00000000 2r00001000
+ 2r00000000 2r00001000
+ 2r00000000 2r00010000
+ 2r01000000 2r00110000
+ 2r00100000 2r01100000
+ 2r00011000 2r01100000
+ 2r00001110 2r11000000
+ 2r00000111 2r11000000
+ 2r00000011 2r10000000
+ 2r00000001 2r10000000
+ 2r00000000 2r00000000]
+ ]
+ ].
+ DefaultCheckForm := Form width:16 height:16 fromArray:bits on:Display
]
! !
@@ -320,5 +340,5 @@
!CheckToggle class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Attic/ChckTggle.st,v 1.21 1995-12-17 16:35:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Attic/ChckTggle.st,v 1.22 1996-02-21 17:02:31 cg Exp $'
! !