--- a/MenuItem.st	Wed Jul 02 15:16:01 1997 +0200
+++ b/MenuItem.st	Thu Jul 03 09:09:02 1997 +0200
@@ -269,26 +269,37 @@
     nameKey notNil ifTrue:[
         coll add:#nameKey: ; add:(nameKey literalArrayEncoding)
     ].
-
-    (something := self enabled) ifFalse:[
-        coll add:#enabled: ; add:(something literalArrayEncoding).
-    ].
-
     value notNil ifTrue:[
         coll add:#value: ; add:(value literalArrayEncoding).
     ].
-
-    (something := self shortcutKeyCharacter) notNil ifTrue:[
-        coll add:#shortcutKeyCharacter: ; add:(something literalArrayEncoding)
+    activeHelpKey notNil ifTrue:[
+        coll add:#activeHelpKey: ; add:(activeHelpKey literalArrayEncoding).
+    ].
+    (something := self enabled) notNil ifTrue:[
+        coll add:#enabled: ; add:(enabled literalArrayEncoding).
     ].
 
-    (something := self accessCharacterPosition) notNil ifTrue:[
-        coll add:#accessCharacterPosition: ; add:(something literalArrayEncoding)
+    adornment notNil ifTrue:[
+        (something := self shortcutKeyCharacter) notNil ifTrue:[
+            coll add:#shortcutKeyCharacter: ; add:(something literalArrayEncoding)
+        ].
+
+        (something := self accessCharacterPosition) notNil ifTrue:[
+            coll add:#accessCharacterPosition: ; add:(something literalArrayEncoding)
+        ].
+
+        (something := self labelImage) notNil ifTrue:[
+            coll add:#labelImage: ; add:(adornment labelImage literalArrayEncoding)
+        ].
+        (something := self indication) notNil ifTrue:[
+            coll add:#indication: ; add:(something literalArrayEncoding)
+        ]
     ].
 
-    (something := self labelImage) notNil ifTrue:[
-        coll add:#labelImage: ; add:(something literalArrayEncoding)
+    self hasSubmenu ifTrue:[
+        coll add:#submenu:; add:(self submenu literalArrayEncoding)
     ].
+
   ^ coll asArray
 ! !
 
@@ -438,5 +449,5 @@
 !MenuItem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/MenuItem.st,v 1.12 1997-06-28 13:12:32 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/MenuItem.st,v 1.13 1997-07-03 07:09:02 ca Exp $'
 ! !