--- a/ColorMenu.st	Thu Sep 12 15:20:06 2002 +0200
+++ b/ColorMenu.st	Thu Sep 12 15:32:18 2002 +0200
@@ -15,7 +15,7 @@
 "{ Package: 'stx:libtool2' }"
 
 MenuPanel subclass:#ColorMenu
-	instanceVariableNames:'model enabledChannel labelsAreColored'
+	instanceVariableNames:'enabledChannel labelsAreColored'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
@@ -48,7 +48,7 @@
 
 documentation
 "
-    ColorMenu used by UIPainter
+    A simple ColorMenu used by the UIPainter
 
     [see also:]
         UIPainter
@@ -57,24 +57,24 @@
     [author:]
         Claus Atzkern
 "
-
 !
 
 examples
 "
-    simple example
+  very simple example
                                                                                 [exBegin]                                      
     |tool top channel|
 
     top := StandardSystemView new.
     top extent:250@30.
+
     channel := (Color red) asValue.
     tool := self origin:0.0@0.0 corner:1.0@1.0 in:top.
     tool model:channel.
+
     top open.
                                                                                 [exEnd]
 "
-
 ! !
 
 !ColorMenu class methodsFor:'menu spec'!
@@ -196,7 +196,7 @@
 
     |item holder color|
 
-    ((item := super accept:anItem) notNil and: [item label ~= 'def']) 
+    ((item := super accept:anItem) notNil and: [item nameKey ~~ #def]) 
     ifTrue:
     [
         (holder := self colorHolder) == item ifTrue:
@@ -268,16 +268,11 @@
     "set my color channel"
 
     model notNil ifTrue:[model removeDependent:self].
-
-    (model := aValueHolder) notNil 
-    ifTrue:
-    [
+    model := aValueHolder.
+    model notNil ifTrue:[
         model addDependent:self.
         self color: model value
     ]
-
-
-
 ! !
 
 !ColorMenu methodsFor:'accessing-look'!
@@ -331,14 +326,20 @@
 
     menu := self class colorMenu:labelsAreColored value:nil.
     menu itemsDo:[:el| el isButton:true].
-    menu addItem:((MenuItem labeled:'def') value: 
-    [
-        |defineColor|
-        defineColor := DefineColor new color: self color.
-        defineColor open.
-        defineColor accept value ifTrue: [self color: defineColor color]
+    menu 
+        addItem:(
+            (MenuItem labeled:'...') 
+                value: 
+                    [
+                        |defineColor|
+                        defineColor := DefineColor new color: self color.
+                        defineColor open.
+                        defineColor accept value ifTrue: [self color: defineColor color]
 
-    ]; isButton: true) beforeIndex:8.
+                    ];
+                nameKey:#def;
+                isButton: true) 
+        beforeIndex:8.
     menu addItem:(MenuItem labeled:'') beforeIndex:8.
     menu addItem:(MenuItem labeled:' ') beforeIndex:5.
     menu addItem:(MenuItem labeled:' ') beforeIndex:2.
@@ -348,7 +349,6 @@
     item value:#selection.
     menu addItem:item beforeIndex:1.
 
-
     self menu:menu.
 
     self do:[:anItem|
@@ -357,7 +357,7 @@
         ] ifFalse:[
             anItem value == #selection ifTrue:[anItem indication:enabledChannel] 
                                       ifFalse:[anItem enabled:false]. 
-            anItem label = 'def' ifTrue:[anItem enabled:enabledChannel] 
+            anItem nameKey == #def ifTrue:[anItem enabled:enabledChannel] 
         ]
     ]
 ! !
@@ -913,5 +913,5 @@
 !ColorMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.27 2002-09-04 19:52:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.28 2002-09-12 13:32:18 cg Exp $'
 ! !