--- a/ColorMenu.st	Sat Jan 22 09:15:16 2011 +0100
+++ b/ColorMenu.st	Sun Jan 23 15:33:06 2011 +0100
@@ -71,15 +71,15 @@
 
 !ColorMenu class methodsFor:'instance creation'!
 
-colorMenu:labelAreColored value:aValue
-    "returns a color menu
-    "
+colorMenu:labelsAreColored value:aValue
+    "returns a color menu"
+
     |menu|
 
     menu := Menu new.
 
     self colorMenu itemsDo:[:el|
-        menu addItem:(self resolveMenuItem:el value:aValue labelAreColored:labelAreColored).
+        menu addItem:(self resolveMenuItem:el value:aValue labelsAreColored:labelsAreColored).
     ].
     ^ menu
 
@@ -87,6 +87,8 @@
      (ColorMenu colorMenu:true  value:nil) startUp
      (ColorMenu colorMenu:false value:#aSelector:) startUp
     "
+
+    "Modified: / 23-01-2011 / 14:58:32 / cg"
 ! !
 
 !ColorMenu class methodsFor:'adding & removing user defined items'!
@@ -324,7 +326,7 @@
     ^ menu
 !
 
-resolveMenuItem:aMenuItem value:aValue labelAreColored:labelAreColored
+resolveMenuItem:aMenuItem value:aValue labelsAreColored:labelsAreColored
     |menuItem label color fgColor submenu|
 
     label    := aMenuItem rawLabel ? ''.
@@ -337,7 +339,7 @@
         menuItem argument:color.
 
         (color isColor and:[label isText not]) ifTrue:[
-            labelAreColored ifTrue:[
+            labelsAreColored ifTrue:[
                 label := Text string:label color:color.
             ] ifFalse:[
                 color brightness < 0.5 ifTrue:[ fgColor := Color white ]
@@ -350,12 +352,15 @@
         ].
         ^ menuItem
     ].
+
     submenu := Menu new.
     aMenuItem submenu itemsDo:[:el|
-        submenu addItem:(self resolveMenuItem:el value:aValue labelAreColored:labelAreColored).
+        submenu addItem:(self resolveMenuItem:el value:aValue labelsAreColored:labelsAreColored).
     ].
     menuItem submenu:submenu.
     ^ menuItem
+
+    "Created: / 23-01-2011 / 14:59:19 / cg"
 ! !
 
 !ColorMenu methodsFor:'accepting'!
@@ -630,7 +635,7 @@
                 submenuChannel:[ self colorHistorySubmenu ]; 
                 nameKey:#pseudoHistory;
                 activeHelpKey:#recentlyUsedColors;
-                isButton: false) 
+                isButton: true) 
         beforeIndex:1.
 
     "/ menu addItem:(MenuItem label:'') beforeIndex:1.
@@ -653,7 +658,7 @@
         ]
     ]
 
-    "Modified: / 18-12-2010 / 13:03:20 / cg"
+    "Modified: / 23-01-2011 / 14:49:32 / cg"
 ! !
 
 !ColorMenu methodsFor:'user actions'!
@@ -685,9 +690,9 @@
 !ColorMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.65 2010-12-18 15:42:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.66 2011-01-23 14:33:06 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.65 2010-12-18 15:42:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.66 2011-01-23 14:33:06 cg Exp $'
 ! !