ColorMenu.st
changeset 4068 b4641443cef0
parent 4057 a5e1c40ecf26
child 4143 c979a5bea623
--- a/ColorMenu.st	Wed Aug 17 09:44:21 2011 +0200
+++ b/ColorMenu.st	Thu Aug 18 02:52:19 2011 +0200
@@ -381,7 +381,7 @@
 accept:anItem
     "accept the current selected item"
 
-    |holder color|
+    |holder colorAccepted|
 
     super accept:anItem.
 
@@ -389,9 +389,9 @@
         holder := self colorHolder.
         holder == anItem ifTrue:[
             self overwriteDefaultToggleChannel value ifTrue:[
-                color := self color.
+                colorAccepted := self color.
             ] ifFalse:[
-                holder label:(Text string:'   ').
+                holder label:'   '.
                 model value:nil withoutNotifying:self
             ].
         ] ifFalse:[  
@@ -400,18 +400,18 @@
                     model value:nil withoutNotifying:self
                 ].
             ] ifFalse:[
-                color := anItem argument.
-                holder label:(Text string:'   ' emphasis:(#backgroundColor->color)).
-                self chooseColor:color.
+                colorAccepted := anItem argument.
+                holder label:(Text string:'   ' emphasis:(#backgroundColor->colorAccepted)).
+                self chooseColor:colorAccepted.
             ].
         ].
-        self class rememberRecentlyUsedColor:color.
+        self class rememberRecentlyUsedColor:colorAccepted.
         acceptAction notNil ifTrue:[
-            acceptAction value:color
+            acceptAction value:colorAccepted
         ].
     ]
 
-    "Modified: / 17-07-2011 / 11:08:07 / cg"
+    "Modified: / 17-08-2011 / 08:57:12 / cg"
 !
 
 chooseColor:aColor
@@ -819,5 +819,5 @@
 !ColorMenu class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.73 2011-07-17 09:13:22 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.74 2011-08-18 00:52:19 cg Exp $'
 ! !