--- a/Tools__BreakpointBrowser.st	Tue Jul 08 16:40:53 2014 +0200
+++ b/Tools__BreakpointBrowser.st	Tue Jul 08 16:47:59 2014 +0200
@@ -1511,29 +1511,30 @@
     menu := Menu new.
     menu addItem:(
             MenuItem new
-                label:'Toggle All';
-                translateLabel:true;
                 hideMenuOnActivated:false;
-                itemValue:[
-                    showCodeBreakpointsFor do:[:each |
-                        each value:(each value not)
-                    ]
-                ]).
+                label:'Toggle All'
+                itemValue:
+                    [
+                        showCodeBreakpointsFor do:[:each |
+                            each value:(each value not)
+                        ]
+                    ]).
     menu addSeparator.
 
     breakpointArgs do:[:arg|
         | menuItem |
 
-        menuItem := MenuItem new.
-        menuItem label:arg.
-        menuItem translateLabel:false.
+        menuItem := MenuItem 
+            label:arg
+            itemValue:
+                [:onOff |
+                    (showCodeBreakpointsFor at:arg ifAbsentPut:[true asValue]) value:onOff.
+                    self updateShownBreakpointList
+                ]
+            translateLabel:false.
         menuItem indication:(showCodeBreakpointsFor at:arg ifAbsentPut:[true asValue]).
         menuItem hideMenuOnActivated:false.
-        menuItem 
-            itemValue:[:onOff |
-                (showCodeBreakpointsFor at:arg ifAbsentPut:[true asValue]) value:onOff.
-                self updateShownBreakpointList
-            ].
+
         menu addItem:menuItem.
     ].
     menu findGuiResourcesIn:self.
@@ -1562,10 +1563,10 @@
     menu := Menu new.
     menu addItem:(
             MenuItem new
-                label:'Toggle All';
-                translateLabel:true;
                 hideMenuOnActivated:false;
-                itemValue:[
+                label:'Toggle All'
+                itemValue:
+                    [
                         enabledCodeBreakpointHolders keysAndValuesDo:[:arg :each |
                             each value:(each value not).
                             each value ifTrue:[
@@ -1574,25 +1575,26 @@
                                 Object disableBreakPoint:arg
                             ].
                         ]
-                      ]).
+                    ]).
     menu addSeparator.
 
     breakpointArgs do:[:arg|
         | menuItem |
 
-        menuItem := MenuItem new.
-        menuItem label:arg.
-        menuItem translateLabel:false.
+        menuItem := MenuItem 
+                        label:arg
+                        itemValue:
+                            [:onOff |
+                                (enabledCodeBreakpointHolders at:arg ifAbsentPut:[(Object isBreakPointEnabled:arg) asValue]) value:onOff.
+                                onOff ifFalse:[
+                                    Object disableBreakPoint:arg
+                                ] ifTrue:[
+                                    Object enableBreakPoint:arg
+                                ].
+                            ]
+                        translateLabel:false.
         menuItem indication:(enabledCodeBreakpointHolders at:arg ifAbsentPut:[ (Object isBreakPointEnabled:arg) asValue ]).
         menuItem hideMenuOnActivated:false.
-        menuItem itemValue:[:onOff |
-            (enabledCodeBreakpointHolders at:arg ifAbsentPut:[(Object isBreakPointEnabled:arg) asValue]) value:onOff.
-            onOff ifFalse:[
-                Object disableBreakPoint:arg
-            ] ifTrue:[
-                Object enableBreakPoint:arg
-            ].
-        ].
         menu addItem:menuItem.
     ].
     menu findGuiResourcesIn:self.
@@ -2055,11 +2057,11 @@
 !BreakpointBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.51 2014-02-03 09:36:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.52 2014-07-08 14:47:59 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.51 2014-02-03 09:36:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.52 2014-07-08 14:47:59 cg Exp $'
 ! !