--- a/LabelAndIcon.st	Mon Aug 21 20:29:32 2000 +0200
+++ b/LabelAndIcon.st	Mon Aug 21 23:54:15 2000 +0200
@@ -301,13 +301,16 @@
 !LabelAndIcon methodsFor:'comparing'!
 
 sameStringAndEmphasisAs:someStringOrLabelAndIcon
+    someStringOrLabelAndIcon class == self class ifTrue:[
+        icon = someStringOrLabelAndIcon icon ifFalse:[^ false].
+        image = someStringOrLabelAndIcon image ifFalse:[^ false].
+        (string sameStringAndEmphasisAs:someStringOrLabelAndIcon string) ifFalse:[ ^ false].
+        ^ true.        
+    ].
+
     (string sameStringAndEmphasisAs:someStringOrLabelAndIcon) ifFalse:[ ^ false].
     (icon isNil and:[image isNil]) ifTrue:[^ true].
-    someStringOrLabelAndIcon isString ifTrue:[^ false].
-    someStringOrLabelAndIcon species == self species ifFalse:[^ false].
-    icon = someStringOrLabelAndIcon icon ifFalse:[^ false].
-    image = someStringOrLabelAndIcon image ifFalse:[^ false].
-    ^ true
+    ^ false
 ! !
 
 !LabelAndIcon methodsFor:'conversion'!
@@ -446,5 +449,5 @@
 !LabelAndIcon class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/LabelAndIcon.st,v 1.26 2000-08-21 11:20:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/LabelAndIcon.st,v 1.27 2000-08-21 21:54:15 cg Exp $'
 ! !