--- a/Toggle.st	Wed Oct 21 16:24:32 2009 +0200
+++ b/Toggle.st	Wed Oct 21 16:24:34 2009 +0200
@@ -528,18 +528,6 @@
     "Modified: / 3.11.1997 / 14:27:03 / cg"
 !
 
-computeLabelSize
-    "compute the extent needed to hold the label plus the lamp"
-
-    super computeLabelSize.
-    showLamp ifTrue:[
-        labelWidth := labelWidth + hSpace + (self lampImageWidth) + hSpace.
-        labelHeight := labelHeight max: self lampImageHeight
-    ]
-
-    "Modified: / 3.11.1997 / 14:26:54 / cg"
-!
-
 getValueFromModel
     "fetch my boolean value from the model (if there is a model around)
      by sending it the aspectMessage, and update my look as required" 
@@ -573,6 +561,22 @@
     ^ lampWidth
 
     "Created: / 3.11.1997 / 14:25:35 / cg"
+!
+
+rawLabelSizeOf:aLogo
+    "compute the extent needed to hold the label plus the lamp"
+
+    |ext|
+
+    ext := super rawLabelSizeOf:aLogo.
+    showLamp ifTrue:[
+        ^ (ext x + hSpace + (self lampImageWidth) + hSpace)
+          @
+          (ext y max: self lampImageHeight)
+    ].
+    ^ ext
+
+    "Modified: / 3.11.1997 / 14:26:54 / cg"
 ! !
 
 !Toggle methodsFor:'queries'!
@@ -653,5 +657,9 @@
 !Toggle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Toggle.st,v 1.54 2008-10-26 20:12:04 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Toggle.st,v 1.55 2009-10-21 14:24:34 cg Exp $'
+!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libwidg/Toggle.st,v 1.55 2009-10-21 14:24:34 cg Exp $'
 ! !