#OTHER
class: HierarchicalItemWithLabelAndIcon
changed: #label:icon:
oops: label was not set (instead, icon was set !)
--- a/HierarchicalItemWithLabelAndIcon.st Sun Jan 24 22:10:18 2016 +0100
+++ b/HierarchicalItemWithLabelAndIcon.st Sun Jan 24 22:18:28 2016 +0100
@@ -60,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 ].
@@ -84,5 +91,9 @@
version
^ '$Header$'
+!
+
+version_CVS
+ ^ '$Header$'
! !