LabelAndIcon.st
branchjv
changeset 4779 85c21ae4fddc
parent 4678 450244b6639f
child 4928 ae564942af8d
--- a/LabelAndIcon.st	Mon Jun 01 06:52:04 2015 +0200
+++ b/LabelAndIcon.st	Tue Jun 02 14:16:10 2015 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libwidg2' }"
 
+"{ NameSpace: Smalltalk }"
+
 ModelListEntry subclass:#LabelAndIcon
 	instanceVariableNames:'icon gap image offset'
 	classVariableNames:''
@@ -468,8 +470,8 @@
 
     |iconHeight imageHeight stringHeight oneMillimeter|
 
-    oneMillimeter := aGC device pixelPerMillimeter x rounded.
-    "/ oneMillimeter := 0.
+    "/oneMillimeter := aGC device pixelPerMillimeter x rounded.
+    oneMillimeter := 0.
 
     icon notNil ifTrue:[
         iconHeight := icon value height + oneMillimeter
@@ -487,6 +489,8 @@
         stringHeight := 0   
     ].
     ^ ((iconHeight max: imageHeight) max: stringHeight)
+
+    "Modified: / 02-06-2015 / 14:14:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 widthOn:aGC
@@ -537,5 +541,10 @@
 
 version_CVS
     ^ '$Header: /cvs/stx/stx/libwidg2/LabelAndIcon.st,v 1.43 2014-12-01 22:16:24 cg Exp $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 ! !