--- a/Toggle.st	Wed Mar 01 15:10:11 2000 +0100
+++ b/Toggle.st	Wed Mar 01 15:11:45 2000 +0100
@@ -528,14 +528,14 @@
     |val|
 
     (model notNil and:[aspectMsg notNil]) ifTrue:[
-        aspectMsg numArgs == 0 ifTrue:[
-            aspectMsg == #value ifTrue:[
-                val := model value
+        aspectMsg == #value ifTrue:[
+            val := model value
+        ] ifFalse:[
+            aspectMsg numArgs == 0 ifTrue:[
+                val := model perform:aspectMsg
             ] ifFalse:[
-                val := model perform:aspectMsg
+                val := model perform:aspectMsg with:self
             ].
-        ] ifFalse:[
-            val := model perform:aspectMsg with:self
         ].
         val == true ifTrue:[  "allowing nil - treat as false"
             self turnOn
@@ -545,7 +545,7 @@
     ].
 
     "Created: / 14.11.1995 / 21:08:43 / cg"
-    "Modified: / 5.3.1998 / 13:35:44 / cg"
+    "Modified: / 1.3.2000 / 15:14:49 / cg"
 !
 
 lampImageHeight
@@ -634,5 +634,5 @@
 !Toggle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Toggle.st,v 1.46 1999-08-18 14:31:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Toggle.st,v 1.47 2000-03-01 14:11:45 cg Exp $'
 ! !