--- a/MenuItem.st	Mon Mar 13 12:38:21 2006 +0100
+++ b/MenuItem.st	Mon Mar 13 16:54:25 2006 +0100
@@ -174,24 +174,18 @@
 !
 
 choice:something
-    "set the value of the instance variable 'choice' (automatically generated)"
-
     choice := something.
 
     "Created: / 14.8.1998 / 14:32:06 / cg"
 !
 
 choiceValue
-    "return the value of the instance variable 'choiceValue' (automatically generated)"
-
     ^ choiceValue
 
     "Created: / 14.8.1998 / 15:39:26 / cg"
 !
 
 choiceValue:something
-    "set the value of the instance variable 'choiceValue' (automatically generated)"
-
     choiceValue := something.
 
     "Created: / 14.8.1998 / 15:39:26 / cg"
@@ -292,27 +286,27 @@
 !
 
 keepLinkedMenu
-    "return the value of the instance variable 'keepLinkedMenu' (automatically generated)"
-
     ^ keepLinkedMenu ? false
 !
 
 keepLinkedMenu:aBoolean
-    "set the value of the instance variable 'keepLinkedMenu' (automatically generated)"
-
     keepLinkedMenu := aBoolean ? false.
 !
 
 labelImage
-    "return the value of the instance variable 'labelImage' (automatically generated)"
-
     ^ labelImage
 !
 
 labelImage:something
-    "set the value of the instance variable 'labelImage' (automatically generated)"
+    labelImage := something.
 
-    labelImage := something.
+    "/ VW compatibility: if I have a label also,
+    "/ this will become a LabelAndImage.
+    something isImage ifTrue:[
+        label notNil ifTrue:[
+            labelImage := LabelAndIcon icon:labelImage string:label
+        ]
+    ].
 !
 
 nameKey
@@ -880,5 +874,5 @@
 !MenuItem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/MenuItem.st,v 1.76 2006-03-06 08:56:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/MenuItem.st,v 1.77 2006-03-13 15:54:25 cg Exp $'
 ! !