--- a/MenuPanel.st	Tue Jan 27 15:36:38 1998 +0100
+++ b/MenuPanel.st	Tue Jan 27 15:45:29 1998 +0100
@@ -12,37 +12,37 @@
 
 
 SimpleView subclass:#MenuPanel
-        instanceVariableNames:'adornment shadowView mapTime mustRearrange superMenu
-                shortKeyInset selection items groupSizes receiver enableChannel
-                menuHolder enabled onLevel offLevel fgColor activeFgColor
-                lastActiveMenu activeBgColor disabledFgColor groupDividerSize
-                itemSpace fitFirstPanel rightArrow rightArrowShadow'
-        classVariableNames:'InitialSelectionQuerySignal DefaultAdornment
-                DefaultGroupDividerSize DefaultHilightLevel DefaultLevel
-                DefaultItemSpace DefaultForegroundColor DefaultBackgroundColor
-                DefaultHilightForegroundColor DefaultHilightBackgroundColor
-                DefaultDisabledForegroundColor DefaultFitFirstPanel
-                RightArrowForm RightArrowShadowForm'
-        poolDictionaries:''
-        category:'Views-Menus'
+	instanceVariableNames:'adornment shadowView mapTime mustRearrange superMenu
+		shortKeyInset selection items groupSizes receiver enableChannel
+		menuHolder enabled onLevel offLevel fgColor activeFgColor
+		lastActiveMenu activeBgColor disabledFgColor groupDividerSize
+		itemSpace fitFirstPanel rightArrow rightArrowShadow'
+	classVariableNames:'InitialSelectionQuerySignal DefaultAdornment
+		DefaultGroupDividerSize DefaultHilightLevel DefaultLevel
+		DefaultItemSpace DefaultForegroundColor DefaultBackgroundColor
+		DefaultHilightForegroundColor DefaultHilightBackgroundColor
+		DefaultDisabledForegroundColor DefaultFitFirstPanel
+		RightArrowForm RightArrowShadowForm'
+	poolDictionaries:''
+	category:'Views-Menus'
 !
 
 Object subclass:#Item
-        instanceVariableNames:'layout menuPanel subMenu adornment rawLabel enableChannel nameKey
-                accessCharacterPosition value label activeHelpKey submenuChannel
-                disabledImage isButton'
-        classVariableNames:'HorizontalInset VerticalInset HorizontalButtonInset
-                VerticalButtonInset LabelRightOffset ShortcutKeyOffset
-                IndicatorOn IndicatorOff'
-        poolDictionaries:''
-        privateIn:MenuPanel
+	instanceVariableNames:'layout menuPanel subMenu adornment rawLabel enableChannel nameKey
+		accessCharacterPosition value label activeHelpKey submenuChannel
+		disabledImage isButton'
+	classVariableNames:'HorizontalInset VerticalInset HorizontalButtonInset
+		VerticalButtonInset LabelRightOffset ShortcutKeyOffset
+		IndicatorOn IndicatorOff'
+	poolDictionaries:''
+	privateIn:MenuPanel
 !
 
 Object subclass:#Adornment
-        instanceVariableNames:'indication accessCharacterPosition shortcutKey argument'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:MenuPanel::Item
+	instanceVariableNames:'indication accessCharacterPosition shortcutKey argument'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:MenuPanel::Item
 !
 
 !MenuPanel class methodsFor:'documentation'!
@@ -2048,6 +2048,7 @@
 destroy
     "destroy items and shadowView; remove dependencies
     "
+    self lastActiveMenu:nil.
     self do:[:el|el destroy].
 
     menuHolder    notNil ifTrue:[menuHolder    removeDependent:self].
@@ -2205,6 +2206,7 @@
 unmap
     "unmap view
     "
+    self lastActiveMenu:nil.
     self ungrabMouseAndKeyboard.
     super unmap.
     shadowView notNil ifTrue:[shadowView unmap].
@@ -2586,12 +2588,20 @@
 
 !MenuPanel::Item class methodsFor:'accessing'!
 
+horizontalInset
+    ^ HorizontalInset
+!
+
 labelRightOffset
     ^ LabelRightOffset
 !
 
 shortcutKeyOffset
     ^ ShortcutKeyOffset
+!
+
+verticalInset
+    ^ VerticalInset
 ! !
 
 !MenuPanel::Item class methodsFor:'defaults'!
@@ -4063,6 +4073,6 @@
 !MenuPanel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.52 1998-01-27 12:56:05 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.53 1998-01-27 14:45:29 ca Exp $'
 ! !
 MenuPanel initialize!