# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 924729882 -7200
# Node ID f5223ad8378e2cd67ead2ef3556e80fa8d21b4e0
# Parent  0acc83cddbc893d85419fbe9158d82d71f5ba85f
disabled fg-color

diff -r 0acc83cddbc8 -r f5223ad8378e ChckTggle.st
--- a/ChckTggle.st	Wed Apr 21 23:12:10 1999 +0200
+++ b/ChckTggle.st	Wed Apr 21 23:24:42 1999 +0200
@@ -449,6 +449,8 @@
         passiveLogo := DefaultPassiveImage onDevice:device.
     ].
 
+    disabledFgColor := styleSheet at:#'checkToggle.disabledForegroundColor' default:disabledFgColor.
+
     DefaultActiveFGColor notNil ifTrue:[
         self activeForegroundColor:DefaultActiveFGColor
     ].
@@ -513,20 +515,21 @@
 drawWith:fg and:bg
     |bgColorUsed|
 
+    bgColorUsed := bg.
+
     controller pressed ifTrue:[
         logo := activeLogo.
+        bgColorUsed := activeBgColor.
     ] ifFalse:[
         logo := passiveLogo.
+        bgColorUsed := bgColor.
     ].
 
-    bgColorUsed := bg.
-
     (controller entered 
     and:[enteredBgColor notNil]) ifTrue:[
         bgColorUsed := enteredBgColor
     ] ifFalse:[
 "/        bgColorUsed := bgColor 
-        bgColorUsed := activeBgColor.
     ].
     super drawWith:fg and:bgColorUsed 
 
@@ -552,5 +555,5 @@
 !CheckToggle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ChckTggle.st,v 1.46 1999-04-21 21:12:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ChckTggle.st,v 1.47 1999-04-21 21:24:42 cg Exp $'
 ! !
diff -r 0acc83cddbc8 -r f5223ad8378e CheckToggle.st
--- a/CheckToggle.st	Wed Apr 21 23:12:10 1999 +0200
+++ b/CheckToggle.st	Wed Apr 21 23:24:42 1999 +0200
@@ -449,6 +449,8 @@
         passiveLogo := DefaultPassiveImage onDevice:device.
     ].
 
+    disabledFgColor := styleSheet at:#'checkToggle.disabledForegroundColor' default:disabledFgColor.
+
     DefaultActiveFGColor notNil ifTrue:[
         self activeForegroundColor:DefaultActiveFGColor
     ].
@@ -513,20 +515,21 @@
 drawWith:fg and:bg
     |bgColorUsed|
 
+    bgColorUsed := bg.
+
     controller pressed ifTrue:[
         logo := activeLogo.
+        bgColorUsed := activeBgColor.
     ] ifFalse:[
         logo := passiveLogo.
+        bgColorUsed := bgColor.
     ].
 
-    bgColorUsed := bg.
-
     (controller entered 
     and:[enteredBgColor notNil]) ifTrue:[
         bgColorUsed := enteredBgColor
     ] ifFalse:[
 "/        bgColorUsed := bgColor 
-        bgColorUsed := activeBgColor.
     ].
     super drawWith:fg and:bgColorUsed 
 
@@ -552,5 +555,5 @@
 !CheckToggle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.46 1999-04-21 21:12:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.47 1999-04-21 21:24:42 cg Exp $'
 ! !