--- a/ColorMenu.st	Sat Aug 31 15:02:12 2013 +0200
+++ b/ColorMenu.st	Sat Aug 31 19:40:48 2013 +0200
@@ -119,7 +119,7 @@
                        ifFalse:[ label := aTitle ].
 
     label := Text string:(' ', label, ' ') foregroundColor:fgColor backgroundColor:bgColor.
-    item  := MenuItem labeled:label.
+    item  := MenuItem label:label.
     submenu addItem:item.
 
     size == 1 ifTrue:[
@@ -132,7 +132,7 @@
 
             label := labels at:idx ifAbsent:defLabel.
             label := Text string:(' ', label, ' ') foregroundColor:fgColor backgroundColor:aBgColor.
-            item  := MenuItem labeled:label.
+            item  := MenuItem label:label.
             item argument:aBgColor.
             
             submenu addItem:item.
@@ -190,7 +190,7 @@
 
     item isNil ifTrue:[
         icon := ToolbarIconLibrary colorHistory16x16Icon.
-        item := MenuItem labeled:icon.
+        item := MenuItem label:icon.
         item nameKey:#userDefined.
         item activeHelpKey:#userDefinedColors.
         menu addItem:item beforeIndex:1.
@@ -684,7 +684,7 @@
             label := Text string:(' ', label, ' ') foregroundColor:fgColor backgroundColor:eachRecentlyUsedColor.
         ].
 
-        item := MenuItem labeled:label.
+        item := MenuItem label:label.
         item argument:eachRecentlyUsedColor.
 
         menu addItem:item.
@@ -722,9 +722,11 @@
 
     menu 
         addItem:(
-            (MenuItem labeled:nil) 
+            (MenuItem 
+                    label:nil
+                    itemValue:[ self openColorEditDialog ] 
+            ) 
                 labelImage:(ToolbarIconLibrary palette16x16Icon);
-                itemValue:[ self openColorEditDialog ]; 
                 nameKey:#pseudoDef;
                 activeHelpKey:#openColorEditor;
                 isButton: true) 
@@ -732,9 +734,11 @@
 
     menu 
         addItem:(
-            (MenuItem labeled:nil) 
+            (MenuItem 
+                label:nil
+                itemValue:[ self pickColorFromScreen ] 
+            ) 
                 labelImage:(ToolbarIconLibrary pipette16x16Icon);
-                itemValue:[ self pickColorFromScreen ]; 
                 nameKey:#pseudoPick;
                 activeHelpKey:#pickColorFromScreen;
                 isButton: true) 
@@ -742,9 +746,11 @@
 
     menu 
         addItem:(
-            (MenuItem labeled:nil)
+            (MenuItem 
+                label:nil
+                submenuChannel:[ self colorHistorySubmenu ] 
+            )
                 labelImage:(ToolbarIconLibrary colorHistory16x16Icon);
-                submenuChannel:[ self colorHistorySubmenu ]; 
                 nameKey:#pseudoHistory;
                 activeHelpKey:#recentlyUsedColors;
                 isButton: true) 
@@ -752,8 +758,9 @@
 
     "/ menu addItem:(MenuItem label:'') beforeIndex:1.
 "/    (showDefaultToggle ? true) ifTrue:[
-        toggleItem := MenuItem labeled:(Text string:' ' emphasis:(#backgroundColor->DefaultViewBackgroundColor)).
-        toggleItem itemValue:#selection.
+        toggleItem := MenuItem 
+                        label:(Text string:' ' emphasis:(#backgroundColor->DefaultViewBackgroundColor))
+                        itemValue:#selection.
         toggleItem isButton: false.
         toggleItem activeHelpKey:#useDefaultColorToggle.    
         toggleItem isVisible:(self useDefaultColorToggleVisibleHolder).    
@@ -761,11 +768,12 @@
 "/    ].
 
     allowNilColor ifTrue:[
-        toggleItem := MenuItem labeled:'No Color'.
+        toggleItem := MenuItem 
+                        label:'No Color'
+                        itemValue:#'hasNilColorHolder:'.
         toggleItem isButton:false.
         toggleItem activeHelpKey:#noColor.    
         toggleItem indication:self hasNilColorHolder.
-        toggleItem itemValue:#'hasNilColorHolder:'.
         menu addItem:toggleItem.
     ].
 
@@ -821,6 +829,6 @@
 !ColorMenu class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.77 2013-07-26 18:46:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.78 2013-08-31 17:40:48 cg Exp $'
 ! !