--- a/LabelAndIcon.st	Mon Jan 26 19:52:53 1998 +0100
+++ b/LabelAndIcon.st	Mon Jan 26 19:55:55 1998 +0100
@@ -366,15 +366,17 @@
 heightOn:aGC
     "return the height of the receiver, if it is to be displayed on aGC"
 
-    |iconHeight imageHeight|
+    |iconHeight imageHeight oneMillimeter|
+
+    oneMillimeter := aGC device pixelPerMillimeter x rounded.
 
     icon notNil ifTrue:[
-        iconHeight := icon height + (aGC device pixelPerMillimeter x rounded)
+        iconHeight := icon height + oneMillimeter
     ] ifFalse:[
         iconHeight := 0
     ].
     image notNil ifTrue:[
-        imageHeight := image height + (aGC device pixelPerMillimeter x rounded)
+        imageHeight := image height + oneMillimeter
     ] ifFalse:[
         imageHeight := 0   
     ].
@@ -408,5 +410,5 @@
 !LabelAndIcon class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/LabelAndIcon.st,v 1.17 1997-12-03 15:08:56 tz Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/LabelAndIcon.st,v 1.18 1998-01-26 18:55:33 ca Exp $'
 ! !