--- a/HierarchicalItemWithLabel.st	Sat Jan 23 06:59:46 2016 +0100
+++ b/HierarchicalItemWithLabel.st	Mon Jan 25 06:42:35 2016 +0100
@@ -36,6 +36,12 @@
 "
 ! !
 
+!HierarchicalItemWithLabel class methodsFor:'instance creation'!
+
+label:aLabel
+    ^ self new label:aLabel
+! !
+
 !HierarchicalItemWithLabel methodsFor:'accessing'!
 
 label
@@ -56,6 +62,6 @@
 !HierarchicalItemWithLabel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItemWithLabel.st,v 1.3 2015-01-29 17:55:03 cg Exp $'
+    ^ '$Header$'
 ! !
 

--- a/HierarchicalItemWithLabelAndIcon.st	Sat Jan 23 06:59:46 2016 +0100
+++ b/HierarchicalItemWithLabelAndIcon.st	Mon Jan 25 06:42:35 2016 +0100
@@ -36,6 +36,12 @@
 "
 ! !
 
+!HierarchicalItemWithLabelAndIcon class methodsFor:'instance creation'!
+
+label:aLabel icon:anIcon
+    ^ self new label:aLabel icon:anIcon
+! !
+
 !HierarchicalItemWithLabelAndIcon methodsFor:'accessing'!
 
 icon
@@ -54,15 +60,22 @@
 !
 
 label:aLabel icon:anIcon
-    |anyChange|
+    |anyChange labelChanged|
 
     anyChange := false.
     (icon ~= anIcon) ifTrue:[
         icon := anIcon.
         anyChange := true
     ].
-    (label ~= anIcon) ifTrue:[
-        icon := anIcon.
+    
+    labelChanged := false.
+    (label isString and:[aLabel isString]) ifTrue:[
+        labelChanged := (label sameStringAndEmphasisAs:aLabel) not.
+    ] ifFalse:[
+        labelChanged := (label ~= aLabel)
+    ].
+    labelChanged ifTrue:[
+        label := aLabel.
         anyChange := true
     ].
     anyChange ifTrue:[ self changed ].
@@ -77,6 +90,10 @@
 !HierarchicalItemWithLabelAndIcon class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItemWithLabelAndIcon.st,v 1.2 2015-01-13 10:31:50 cg Exp $'
+    ^ '$Header$'
+!
+
+version_CVS
+    ^ '$Header$'
 ! !