diff -r cb9832e71cae -r 695f10f213d1 UIPainter.st
--- a/UIPainter.st	Thu Dec 04 17:54:45 2003 +0100
+++ b/UIPainter.st	Fri Dec 19 13:33:44 2003 +0100
@@ -979,328 +979,320 @@
     <resource: #menu>
 
     ^ 
-     #(#Menu
-        #(
-         #(#MenuItem
-            #activeHelpKey: #file
-            #enabled: #enableChannel
-            #label: '&File'
-            #translateLabel: true
-            #submenu: 
-           #(#Menu
-              #(
-               #(#MenuItem
-                  #activeHelpKey: #fileNew
-                  #label: 'New'
-                  #itemValue: #doNew
-                  #translateLabel: true
+     #(Menu
+        (
+         (MenuItem
+            enabled: enableChannel
+            label: '&File'
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  activeHelpKey: fileNew
+                  label: 'New'
+                  itemValue: doNew
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #fileLoad
-                  #label: 'Load...'
-                  #itemValue: #doLoad
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: fileLoad
+                  label: 'Load...'
+                  itemValue: doLoad
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #activeHelpKey: #fileLoadSubspec
-                  #label: 'Load Subspec...'
-                  #itemValue: #doLoadSubspec
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: fileLoadSubspec
+                  label: 'Load Subspec...'
+                  itemValue: doLoadSubspec
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #fileSave
-                  #label: 'Save'
-                  #itemValue: #doSave
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: fileSave
+                  label: 'Save'
+                  itemValue: doSave
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #activeHelpKey: #fileSaveAs
-                  #label: 'Save As...'
-                  #itemValue: #doSaveAs
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: fileSaveAs
+                  label: 'Save As...'
+                  itemValue: doSaveAs
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #activeHelpKey: #fileSaveAs
-                  #label: 'Define Class and Selector...'
-                  #itemValue: #doDefineClassAndSelector
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: fileSaveAs
+                  label: 'Define Class and Selector...'
+                  itemValue: doDefineClassAndSelector
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #filePickAnInterface
-                  #label: 'Pick a Window Spec...'
-                  #itemValue: #doPickAView
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: filePickAnInterface
+                  label: 'Pick a Window Spec...'
+                  itemValue: doPickAView
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #fileShowWindowSpec
-                  #label: 'Show Window Spec'
-                  #itemValue: #doWindowSpec
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: fileShowWindowSpec
+                  label: 'Show Window Spec'
+                  itemValue: doWindowSpec
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #activeHelpKey: #fileBrowseClass
-                  #enabled: #hasSpecClass
-                  #label: 'Browse Applications Class'
-                  #itemValue: #doBrowseClass
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: fileBrowseClass
+                  enabled: hasSpecClass
+                  label: 'Browse Applications Class'
+                  itemValue: doBrowseClass
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #activeHelpKey: #fileBrowseAspectMethods
-                  #enabled: #hasSpecClass
-                  #label: 'Browse Applications Aspect Methods'
-                  #itemValue: #doBrowseAspectMethods
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: fileBrowseAspectMethods
+                  enabled: hasSpecClass
+                  label: 'Browse Applications Aspect Methods'
+                  itemValue: doBrowseAspectMethods
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #fileExit
-                  #label: 'Exit'
-                  #itemValue: #closeRequest
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: fileExit
+                  label: 'Exit'
+                  itemValue: closeRequest
+                  translateLabel: true
                 )
                )
               nil
               nil
             )
           )
-         #(#MenuItem
-            #activeHelpKey: #edit
-            #label: 'Edit'
-            #translateLabel: true
-            #submenuChannel: #menuEdit
+         (MenuItem
+            label: 'Edit'
+            translateLabel: true
+            submenuChannel: menuEdit
           )
-         #(#MenuItem
-            #activeHelpKey: #align
-            #label: 'Align'
-            #translateLabel: true
-            #submenuChannel: #menuAlign
+         (MenuItem
+            label: 'Align'
+            translateLabel: true
+            submenuChannel: menuAlign
           )
-         #(#MenuItem
-            #activeHelpKey: #generate
-            #label: 'Generate'
-            #translateLabel: true
-            #submenu: 
-           #(#Menu
-              #(
-               #(#MenuItem
-                  #activeHelpKey: #generateAspectMethods
-                  #enabled: #hasSpecClass
-                  #label: 'Aspect Methods'
-                  #itemValue: #doGenerateAspectMethods
-                  #translateLabel: true
+         (MenuItem
+            label: 'Generate'
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  activeHelpKey: generateAspectMethods
+                  enabled: hasSpecClass
+                  label: 'Aspect Methods'
+                  itemValue: doGenerateAspectMethods
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #activeHelpKey: #generateAspectMethodFor
-                  #enabled: #hasSpecClass
-                  #label: 'Aspect Method For...'
-                  #itemValue: #doGenerateAspectMethodFor
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: generateAspectMethodFor
+                  enabled: hasSpecClass
+                  label: 'Aspect Method For...'
+                  itemValue: doGenerateAspectMethodFor
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #enabled: #hasSpecClass
-                  #label: 'Menu Stub Methods'
-                  #itemValue: #doGenerateMenuMethods
-                  #translateLabel: true
+               (MenuItem
+                  enabled: hasSpecClass
+                  label: 'Menu Stub Methods'
+                  itemValue: doGenerateMenuMethods
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #generateHookMethods
-                  #enabled: #hasSpecClass
-                  #label: 'Hook Methods'
-                  #itemValue: #doGenerateHookMethods
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: generateHookMethods
+                  enabled: hasSpecClass
+                  label: 'Hook Methods'
+                  itemValue: doGenerateHookMethods
+                  translateLabel: true
                 )
                )
               nil
               nil
             )
           )
-         #(#MenuItem
-            #activeHelpKey: #test
-            #label: 'Test'
-            #translateLabel: true
-            #submenu: 
-           #(#Menu
-              #(
-               #(#MenuItem
-                  #activeHelpKey: #testStartApplication
-                  #label: 'Start Application'
-                  #itemValue: #doStartApplication
-                  #translateLabel: true
+         (MenuItem
+            label: 'Test'
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  activeHelpKey: testStartApplication
+                  label: 'Start Application'
+                  itemValue: doStartApplication
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #testGeometryTestMode
-                  #label: 'Geometry Test Mode'
-                  #translateLabel: true
-                  #indication: #testMode:
+               (MenuItem
+                  activeHelpKey: testGeometryTestMode
+                  label: 'Geometry Test Mode'
+                  translateLabel: true
+                  indication: testMode:
                 )
                )
               nil
               nil
             )
           )
-         #(#MenuItem
-            #activeHelpKey: #settings
-            #label: 'Settings'
-            #translateLabel: true
-            #submenu: 
-           #(#Menu
-              #(
-               #(#MenuItem
-                  #activeHelpKey: #settingsCanvas
-                  #label: 'Canvas'
-                  #translateLabel: true
-                  #indication: #painterShown
+         (MenuItem
+            label: 'Settings'
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  activeHelpKey: settingsCanvas
+                  label: 'Canvas'
+                  translateLabel: true
+                  indication: painterShown
                 )
-               #(#MenuItem
-                  #activeHelpKey: #settingsGallery
-                  #label: 'Gallery'
-                  #translateLabel: true
-                  #indication: #galleryShown
+               (MenuItem
+                  activeHelpKey: settingsGallery
+                  label: 'Gallery'
+                  translateLabel: true
+                  indication: galleryShown
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  activeHelpKey: settingsRedefineAspectMethods
+                  enabled: hasSpecClass
+                  label: 'Redefine Aspect Methods'
+                  translateLabel: true
+                  indication: redefineAspectMethods:
                 )
-               #(#MenuItem
-                  #activeHelpKey: #settingsRedefineAspectMethods
-                  #enabled: #hasSpecClass
-                  #label: 'Redefine Aspect Methods'
-                  #translateLabel: true
-                  #indication: #redefineAspectMethods:
+               (MenuItem
+                  activeHelpKey: settingsAspectsAsInstances
+                  enabled: hasSpecClass
+                  label: 'Aspects as InstanceVariables'
+                  translateLabel: true
+                  indication: generateAspectsAsInstanceVariables:
                 )
-               #(#MenuItem
-                  #activeHelpKey: #settingsAspectsAsInstances
-                  #enabled: #hasSpecClass
-                  #label: 'Aspects as InstanceVariables'
-                  #translateLabel: true
-                  #indication: #generateAspectsAsInstanceVariables:
+               (MenuItem
+                  label: 'AutoAccept on Selection-Change '
+                  translateLabel: true
+                  indication: autoAcceptOnSelectionChange
                 )
-               #(#MenuItem
-                  #label: 'AutoAccept on Selection-Change '
-                  #translateLabel: true
-                  #indication: #autoAcceptOnSelectionChange
-                )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #settingsUndoManager
-                  #enabled: #hasUndoHistory
-                  #label: 'Undo Manager...'
-                  #itemValue: #openUndoMenu
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: settingsUndoManager
+                  enabled: hasUndoHistory
+                  label: 'Undo Manager...'
+                  itemValue: openUndoMenu
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #activeHelpKey: #settingsGridManager
-                  #label: 'Grid Manager...'
-                  #itemValue: #doDefineGrid
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: settingsGridManager
+                  label: 'Grid Manager...'
+                  itemValue: doDefineGrid
+                  translateLabel: true
                 )
                )
               nil
               nil
             )
           )
-         #(#MenuItem
-            #activeHelpKey: #history
-            #label: 'History'
-            #translateLabel: true
-            #submenuChannel: #menuHistory
+         (MenuItem
+            label: 'History'
+            translateLabel: true
+            submenuChannel: menuHistory
           )
-         #(#MenuItem
-            #activeHelpKey: #help
-            #label: 'Help'
-            #translateLabel: true
-            #startGroup: #right
-            #submenu: 
-           #(#Menu
-              #(
-               #(#MenuItem
-                  #activeHelpKey: #helpTutorial
-                  #label: 'Tutorial'
-                  #itemValue: #openHTMLDocument:
-                  #translateLabel: true
-                  #argument: 'tools/uipainter/TOP.html'
+         (MenuItem
+            label: 'Help'
+            translateLabel: true
+            startGroup: right
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  activeHelpKey: helpTutorial
+                  label: 'Tutorial'
+                  itemValue: openHTMLDocument:
+                  translateLabel: true
+                  argument: 'tools/uipainter/TOP.html'
+                )
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #label: '-'
-                )
-               #(#MenuItem
-                  #activeHelpKey: #helpFunctions
-                  #label: 'Functions'
-                  #itemValue: #openHTMLDocument:
-                  #translateLabel: true
-                  #argument: 'tools/uipainter/Functions.html'
+               (MenuItem
+                  activeHelpKey: helpFunctions
+                  label: 'Functions'
+                  itemValue: openHTMLDocument:
+                  translateLabel: true
+                  argument: 'tools/uipainter/Functions.html'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #helpExamples
-                  #label: 'Examples'
-                  #itemValue: #openHTMLDocument:
-                  #translateLabel: true
-                  #argument: 'tools/uipainter/Examples.html'
+               (MenuItem
+                  activeHelpKey: helpExamples
+                  label: 'Examples'
+                  itemValue: openHTMLDocument:
+                  translateLabel: true
+                  argument: 'tools/uipainter/Examples.html'
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #helpHelpTool
-                  #label: 'Help Tool'
-                  #itemValue: #openHTMLDocument:
-                  #translateLabel: true
-                  #argument: 'tools/uipainter/HelpTool.html'
+               (MenuItem
+                  activeHelpKey: helpHelpTool
+                  label: 'Help Tool'
+                  itemValue: openHTMLDocument:
+                  translateLabel: true
+                  argument: 'tools/uipainter/HelpTool.html'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #helpLayoutTool
-                  #label: 'Layout Tool'
-                  #itemValue: #openHTMLDocument:
-                  #translateLabel: true
-                  #argument: 'tools/uipainter/LayoutTool.html'
+               (MenuItem
+                  activeHelpKey: helpLayoutTool
+                  label: 'Layout Tool'
+                  itemValue: openHTMLDocument:
+                  translateLabel: true
+                  argument: 'tools/uipainter/LayoutTool.html'
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #helpSelectedWidget
-                  #label: 'Selected Widget'
-                  #itemValue: #doOpenWidgetDocumentation
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: helpSelectedWidget
+                  label: 'Selected Widget'
+                  itemValue: doOpenWidgetDocumentation
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #helpShowHelp
-                  #label: 'Show Help Texts'
-                  #translateLabel: true
-                  #indication: #showingHelp:
+               (MenuItem
+                  activeHelpKey: helpShowHelp
+                  label: 'Show Help Texts'
+                  translateLabel: true
+                  indication: showingHelp:
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #activeHelpKey: #aboutThisAppliaction
-                  #label: 'About this Application...'
-                  #itemValue: #openAboutThisApplication
-                  #translateLabel: true
+               (MenuItem
+                  activeHelpKey: aboutThisAppliaction
+                  label: 'About this Application...'
+                  itemValue: openAboutThisApplication
+                  translateLabel: true
                 )
                )
               nil