--- a/CheckToggle.st	Fri Oct 30 11:11:23 2009 +0100
+++ b/CheckToggle.st	Fri Oct 30 19:13:45 2009 +0100
@@ -781,40 +781,43 @@
 !
 
 logoToDisplay
-    DefaultDisabledActiveImage notNil ifTrue:[
-        (controller enabled not and:[controller pressed]) ifTrue:[
-            activeLogo := DefaultDisabledActiveImage onDevice:device.
-            ^ activeLogo.
-        ].
-    ].
-    DefaultDisabledPassiveImage notNil ifTrue:[
-        (controller enabled not and:[controller pressed not]) ifTrue:[
-            passiveLogo := enteredLogo := DefaultDisabledActiveImage onDevice:device.
-            ^ passiveLogo.
-        ].
-    ].
-    DefaultEnteredActiveImage notNil ifTrue:[
-        (controller enabled and:[controller entered and:[controller pressed]]) ifTrue:[
-            activeLogo := enteredLogo := DefaultEnteredActiveImage onDevice:device.
-            ^ activeLogo.
+    controller enabled ifFalse:[    
+        (controller pressed) ifTrue:[
+            DefaultDisabledActiveImage notNil ifTrue:[
+                activeLogo := enteredLogo := DefaultDisabledActiveImage onDevice:device.
+                ^ activeLogo.
+            ].
+        ] ifFalse:[
+            DefaultDisabledPassiveImage notNil ifTrue:[
+                passiveLogo := enteredLogo := DefaultDisabledPassiveImage onDevice:device.
+                ^ passiveLogo.
+            ].
         ].
-    ].
-    DefaultEnteredPassiveImage notNil ifTrue:[
-        (controller enabled and:[controller entered and:[controller pressed not]]) ifTrue:[
-            passiveLogo := enteredLogo := DefaultEnteredPassiveImage onDevice:device.
-            ^ passiveLogo.
-        ].
-    ].
-    DefaultActiveImage notNil ifTrue:[
-        (controller enabled and:[controller entered not and:[controller pressed]]) ifTrue:[
-            activeLogo := DefaultActiveImage onDevice:device.
-            ^ activeLogo.
-        ].
-    ].
-    DefaultPassiveImage notNil ifTrue:[
-        (controller enabled and:[controller entered not and:[controller pressed not]]) ifTrue:[
-            passiveLogo := DefaultPassiveImage onDevice:device.
-            ^ passiveLogo.
+    ] ifTrue:[
+        controller entered ifTrue:[
+            (controller pressed) ifTrue:[
+                DefaultEnteredActiveImage notNil ifTrue:[
+                    activeLogo := enteredLogo := DefaultEnteredActiveImage onDevice:device.
+                    ^ activeLogo.
+                ].
+            ] ifFalse:[
+                DefaultEnteredPassiveImage notNil ifTrue:[
+                    passiveLogo := enteredLogo := DefaultEnteredPassiveImage onDevice:device.
+                    ^ passiveLogo.
+                ].
+            ].
+        ] ifFalse:[
+            (controller pressed) ifTrue:[
+                DefaultActiveImage notNil ifTrue:[
+                    activeLogo := enteredLogo := DefaultActiveImage onDevice:device.
+                    ^ activeLogo.
+                ].
+            ] ifFalse:[
+                DefaultPassiveImage notNil ifTrue:[
+                    passiveLogo := enteredLogo := DefaultPassiveImage onDevice:device.
+                    ^ passiveLogo.
+                ].
+            ].
         ].
     ].
 
@@ -827,9 +830,9 @@
 !CheckToggle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.68 2009-10-24 20:32:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.69 2009-10-30 18:13:45 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.68 2009-10-24 20:32:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.69 2009-10-30 18:13:45 cg Exp $'
 ! !