# HG changeset patch
# User sr
# Date 1253011428 -7200
# Node ID d05d10503c6705481c554e6f9e8b1fe39bae1122
# Parent  bf377c5448509038f109018bcc799ac6047b0383
halfway fix

diff -r bf377c544850 -r d05d10503c67 ColorMenu.st
--- a/ColorMenu.st	Fri Sep 11 17:26:10 2009 +0200
+++ b/ColorMenu.st	Tue Sep 15 12:43:48 2009 +0200
@@ -13,7 +13,7 @@
 
 MenuPanel subclass:#ColorMenu
 	instanceVariableNames:'enabledChannel labelsAreColored color colorName
-		allowSymbolicColors'
+		allowSymbolicColors showDefaultToggle acceptAction'
 	classVariableNames:'ColorMenuSpec RecentlyUsedColors'
 	poolDictionaries:''
 	category:'Interface-UIPainter'
@@ -365,6 +365,7 @@
     |item holder color|
 
     item := super accept:anItem.
+
     (item notNil and:[((item nameKey ? '') startsWith:'pseudo') not]) ifTrue:[
         holder := self colorHolder.
         holder == item ifTrue:[
@@ -379,6 +380,9 @@
         ].
         self chooseColor:color.
         self class rememberRecentlyUsedColor:color.
+        acceptAction notNil ifTrue:[
+            acceptAction value:color
+        ].
     ]
 !
 
@@ -394,6 +398,10 @@
 
 !ColorMenu methodsFor:'accessing'!
 
+acceptAction:something
+    acceptAction := something.
+!
+
 allowSymbolicColors
     ^ allowSymbolicColors
 !
@@ -445,7 +453,7 @@
 colorHolder
     "returns the item which keeps the selected color in its label"
 
-  ^ self itemAt:#selection
+    ^ self itemAt:#selection
 !
 
 contents
@@ -612,12 +620,13 @@
         beforeIndex:1.
 
     "/ menu addItem:(MenuItem label:'') beforeIndex:1.
-
-    toggleItem := MenuItem labeled:(Text string:' ' emphasis:(#backgroundColor->DefaultViewBackgroundColor)).
-    toggleItem value:#selection.
-    toggleItem isButton: false.
-    toggleItem activeHelpKey:#useDefaultColorToggle.    
-    menu addItem:toggleItem beforeIndex:1.
+"/    (showDefaultToggle ? true) ifTrue:[
+        toggleItem := MenuItem labeled:(Text string:' ' emphasis:(#backgroundColor->DefaultViewBackgroundColor)).
+        toggleItem value:#selection.
+        toggleItem isButton: false.
+        toggleItem activeHelpKey:#useDefaultColorToggle.    
+        menu addItem:toggleItem beforeIndex:1.
+"/    ].
 
     self menu:menu.
 
@@ -659,5 +668,5 @@
 !ColorMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.62 2009-09-11 14:42:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.63 2009-09-15 10:43:48 sr Exp $'
 ! !