--- a/LabelAndTwoIcons.st	Tue Aug 09 12:47:00 2016 +0200
+++ b/LabelAndTwoIcons.st	Tue Aug 09 12:47:13 2016 +0200
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libwidg2' }"
 
+"{ NameSpace: Smalltalk }"
+
 LabelAndIcon subclass:#LabelAndTwoIcons
 	instanceVariableNames:'image2'
 	classVariableNames:''
@@ -103,7 +105,7 @@
 
     image2Value := image2 value.
     image2Value notNil ifTrue:[
-        asc  := (aGC font onDevice:aGC device) ascent.
+        asc  := aGC deviceFont ascent.
         image2Height  := image2Value notNil ifTrue:[image2Value height]  ifFalse:[0].
         maxHeight := self heightOn:aGC.
         x1 := x  + gap + (super widthOn:aGC).
@@ -126,9 +128,8 @@
 
     |image2Height oneMillimeter|
 
-    oneMillimeter := aGC device pixelPerMillimeter x rounded.
-
     image2 notNil ifTrue:[
+        oneMillimeter := aGC device isNil ifTrue:[2] ifFalse:[aGC verticalIntegerPixelPerMillimeter].
         image2Height := image2 value height + oneMillimeter
     ] ifFalse:[
         image2Height := 0   
@@ -151,5 +152,6 @@
 !LabelAndTwoIcons class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/LabelAndTwoIcons.st,v 1.4 2010-02-01 11:29:25 cg Exp $'
+    ^ '$Header$'
 ! !
+