diff -r 7894e542c64b -r fbc9a32078b5 MenuEditor.st
--- a/MenuEditor.st	Wed Feb 02 15:44:00 2000 +0100
+++ b/MenuEditor.st	Wed Feb 02 17:14:25 2000 +0100
@@ -1279,7 +1279,7 @@
           #name: 'Menu Editor'
           #min: #(#Point 550 440)
           #max: #(#Point 1152 900)
-          #bounds: #(#Rectangle 37 413 594 853)
+          #bounds: #(#Rectangle 12 22 569 462)
           #menu: #menu
           #returnIsOKInDialog: false
           #escapeIsCancelInDialog: false
@@ -1288,8 +1288,13 @@
        #(#SpecCollection
           #collection: #(
            #(#MenuPanelSpec
+              #attributes: 
+             #(#tabable
+                true
+              )
               #name: 'menuToolbarView'
               #layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 32 0)
+              #tabable: true
               #menu: #menuToolbar
               #showSeparatingLines: true
             )
@@ -1314,6 +1319,10 @@
                    #(#SpecCollection
                       #collection: #(
                        #(#NoteBookViewSpec
+                          #attributes: 
+                         #(#tabable
+                            true
+                          )
                           #name: 'NoteBook'
                           #layout: #(#LayoutFrame 1 0.0 0 0.0 1 1.0 -30 1.0)
                           #enableChannel: #hasAnySingleSelection
@@ -1790,139 +1799,138 @@
 
     <resource: #menu>
 
-    ^
-     
-       #(#Menu
-          
-           #(
-             #(#MenuItem
-                #label: 'New'
-                #isButton: true
-                #value: #doNew
-                #activeHelpKey: #fileNew
-                #labelImage: #(#ResourceRetriever #Icon #newIcon)
-            )
-             #(#MenuItem
-                #label: 'Load'
-                #isButton: true
-                #value: #doLoad
-                #activeHelpKey: #fileLoad
-                #labelImage: #(#ResourceRetriever #Icon #loadIcon)
-            )
-             #(#MenuItem
-                #label: 'Save'
-                #isButton: true
-                #value: #doSave
-                #activeHelpKey: #fileSave
-                #labelImage: #(#ResourceRetriever #Icon #saveIcon)
-            )
-             #(#MenuItem
-                #label: ''
-            )
-             #(#MenuItem
-                #label: 'Cut'
-                #isButton: true
-                #value: #doCut
-                #activeHelpKey: #editCut
-                #enabled: #hasValidSelection
-                #labelImage: #(#ResourceRetriever #Icon #cutIcon)
-            )
-             #(#MenuItem
-                #label: 'Copy'
-                #isButton: true
-                #value: #doCopy
-                #activeHelpKey: #editCopy
-                #enabled: #hasValidSelection
-                #labelImage: #(#ResourceRetriever #Icon #copyIcon)
-            )
-             #(#MenuItem
-                #label: 'Paste'
-                #isButton: true
-                #value: #doPaste
-                #activeHelpKey: #editPaste
-                #enabled: #valueOfCanPaste
-                #labelImage: #(#ResourceRetriever #Icon #pasteIcon)
-            )
-             #(#MenuItem
-                #label: 'Delete'
-                #isButton: true
-                #value: #doDelete
-                #activeHelpKey: #editDelete
-                #enabled: #hasValidSelection
-                #labelImage: #(#ResourceRetriever #Icon #deleteIcon)
-            )
-             #(#MenuItem
-                #label: ''
-            )
-             #(#MenuItem
-                #label: 'Add Item'
-                #isButton: true
-                #value: #doCreateItem
-                #activeHelpKey: #addMenuItem
-                #enabled: #hasAnySingleSelection
-                #labelImage: #(#ResourceRetriever nil #menuItemImage)
-            )
-             #(#MenuItem
-                #label: 'Add Separator'
-                #isButton: true
-                #value: #doCreateSep
-                #activeHelpKey: #addMenuSeparator
-                #enabled: #hasAnySingleSelection
-                #labelImage: #(#ResourceRetriever nil #menuSeparatorImage)
-            )
-             #(#MenuItem
-                #label: 'Add Submenu'
-                #isButton: true
-                #value: #doCreateMenu
-                #activeHelpKey: #addSubMenu
-                #enabled: #hasAnySingleSelection
-                #labelImage: #(#ResourceRetriever nil #submenuImage)
-            )
-             #(#MenuItem
-                #label: 'Add Linked Submenu'
-                #isButton: true
-                #value: #doCreateLink
-                #activeHelpKey: #addSubMenuLink
-                #enabled: #hasAnySingleSelection
-                #labelImage: #(#ResourceRetriever nil #linkSubmenuImage)
-            )
-             #(#MenuItem
-                #label: ''
-            )
-             #(#MenuItem
-                #label: 'Move Up'
-                #isButton: true
-                #value: #doStepUp
-                #activeHelpKey: #editMoveUp
-                #enabled: #valueOfEnableMovingUpOrDown
-                #labelImage: #(#ResourceRetriever #Icon #upIcon)
-            )
-             #(#MenuItem
-                #label: 'Move Down'
-                #isButton: true
-                #value: #doStepDown
-                #activeHelpKey: #editMoveDown
-                #enabled: #valueOfEnableMovingUpOrDown
-                #labelImage: #(#ResourceRetriever #Icon #downIcon)
-            )
-             #(#MenuItem
-                #label: 'Move In'
-                #isButton: true
-                #value: #doStepIn
-                #activeHelpKey: #editMoveIn
-                #enabled: #valueOfEnableMovingIn
-                #labelImage: #(#ResourceRetriever #Icon #downRightIcon)
-            )
-             #(#MenuItem
-                #label: 'Move Out'
-                #isButton: true
-                #value: #doStepOut
-                #activeHelpKey: #editMoveOut
-                #enabled: #valueOfEnableMovingOut
-                #labelImage: #(#ResourceRetriever #Icon #leftDownIcon)
-            )
-          ) nil
-          nil
+    ^ 
+     #(#Menu
+        #(
+         #(#MenuItem
+            #label: 'New'
+            #isButton: true
+            #value: #doNew
+            #activeHelpKey: #fileNew
+            #labelImage: #(#ResourceRetriever #Icon #newIcon)
+          )
+         #(#MenuItem
+            #label: 'Load'
+            #isButton: true
+            #value: #doLoad
+            #activeHelpKey: #fileLoad
+            #labelImage: #(#ResourceRetriever #Icon #loadIcon)
+          )
+         #(#MenuItem
+            #label: 'Save'
+            #isButton: true
+            #value: #doSave
+            #activeHelpKey: #fileSave
+            #labelImage: #(#ResourceRetriever #Icon #saveIcon)
+          )
+         #(#MenuItem
+            #label: ''
+          )
+         #(#MenuItem
+            #label: 'Cut'
+            #isButton: true
+            #value: #doCut
+            #activeHelpKey: #editCut
+            #enabled: #hasValidSelection
+            #labelImage: #(#ResourceRetriever #Icon #cutIcon)
+          )
+         #(#MenuItem
+            #label: 'Copy'
+            #isButton: true
+            #value: #doCopy
+            #activeHelpKey: #editCopy
+            #enabled: #hasValidSelection
+            #labelImage: #(#ResourceRetriever #Icon #copyIcon)
+          )
+         #(#MenuItem
+            #label: 'Paste'
+            #isButton: true
+            #value: #doPaste
+            #activeHelpKey: #editPaste
+            #enabled: #valueOfCanPaste
+            #labelImage: #(#ResourceRetriever #Icon #pasteIcon)
+          )
+         #(#MenuItem
+            #label: 'Delete'
+            #isButton: true
+            #value: #doDelete
+            #activeHelpKey: #editDelete
+            #enabled: #hasValidSelection
+            #labelImage: #(#ResourceRetriever #Icon #deleteIcon)
+          )
+         #(#MenuItem
+            #label: ''
+          )
+         #(#MenuItem
+            #label: 'Add Item'
+            #isButton: true
+            #value: #doCreateItem
+            #activeHelpKey: #addMenuItem
+            #enabled: #hasAnySingleSelection
+            #labelImage: #(#ResourceRetriever nil #menuItemImage)
+          )
+         #(#MenuItem
+            #label: 'Add Separator'
+            #isButton: true
+            #value: #doCreateSep
+            #activeHelpKey: #addMenuSeparator
+            #enabled: #hasAnySingleSelection
+            #labelImage: #(#ResourceRetriever nil #menuSeparatorImage)
+          )
+         #(#MenuItem
+            #label: 'Add Submenu'
+            #isButton: true
+            #value: #doCreateMenu
+            #activeHelpKey: #addSubMenu
+            #enabled: #hasAnySingleSelection
+            #labelImage: #(#ResourceRetriever nil #submenuImage)
+          )
+         #(#MenuItem
+            #label: 'Add Linked Submenu'
+            #isButton: true
+            #value: #doCreateLink
+            #activeHelpKey: #addSubMenuLink
+            #enabled: #hasAnySingleSelection
+            #labelImage: #(#ResourceRetriever nil #linkSubmenuImage)
+          )
+         #(#MenuItem
+            #label: ''
+          )
+         #(#MenuItem
+            #label: 'Move Up'
+            #isButton: true
+            #value: #doStepUp
+            #activeHelpKey: #editMoveUp
+            #enabled: #valueOfEnableMovingUpOrDown
+            #labelImage: #(#ResourceRetriever #Icon #upIcon)
+          )
+         #(#MenuItem
+            #label: 'Move Down'
+            #isButton: true
+            #value: #doStepDown
+            #activeHelpKey: #editMoveDown
+            #enabled: #valueOfEnableMovingUpOrDown
+            #labelImage: #(#ResourceRetriever #Icon #downIcon)
+          )
+         #(#MenuItem
+            #label: 'Move In'
+            #isButton: true
+            #value: #doStepIn
+            #activeHelpKey: #editMoveIn
+            #enabled: #valueOfEnableMovingIn
+            #labelImage: #(#ResourceRetriever #Icon #downRightIcon)
+          )
+         #(#MenuItem
+            #label: 'Move Out'
+            #isButton: true
+            #value: #doStepOut
+            #activeHelpKey: #editMoveOut
+            #enabled: #valueOfEnableMovingOut
+            #labelImage: #(#ResourceRetriever #Icon #leftDownIcon)
+          )
+         )
+        nil
+        nil
       )
 ! !
 
@@ -2308,15 +2316,6 @@
 
 !MenuEditor methodsFor:'selection'!
 
-clearSelection
-
-    tabSelection ~~ 0 ifTrue:[
-        tabSelection := 0.
-        self tabCanvasHolder value:nil
-    ].
-    typeOfCanvas := nil.
-!
-
 imageSelected
     |imgSel|
 
@@ -2358,9 +2357,13 @@
             slices := myClass perform:#slicesSeparatorMenu.
         ].
         index := tabSelection ? 0.
-        self clearSelection.
 
         slices ~~ oldSlices ifTrue:[
+            tabSelection := 0.
+            typeOfCanvas := 0.
+
+            self tabCanvasHolder value:nil.
+
             newList := slices collect:[:el| el first].
 
             index ~~ 0 ifTrue:[
@@ -2387,7 +2390,7 @@
     "
     |view spec|
 
-    aSelection == tabSelection ifTrue:[^self].
+    aSelection = tabSelection ifTrue:[^self].
 
     (tabSelection := aSelection) isNil ifTrue:[
         tabSelection == 0 ifTrue:[^ self].
@@ -3052,6 +3055,10 @@
 
 !MenuEditor::TreeView methodsFor:'accessing'!
 
+canTab
+    ^ true
+!
+
 selectorName
     "get the selector of the menu spec"