Remove manual menu bar construction code

diff --git a/library/ui/cocoa/load.factor b/library/ui/cocoa/load.factor
index e8f54629c84ede4f61fc9f5c24d0bbaaf38cd31c..73c470f2f5a49092a52730e0cf9f5df133476b2b 100644 (file)
--- a/library/ui/cocoa/load.factor
+++ b/library/ui/cocoa/load.factor
@@ -12,7 +12,6 @@ PROVIDE: library/ui/cocoa {
     "view-utils.factor"
     "window-utils.factor"
     "dialogs.factor"
-    "menu-bar.factor"
     "services.factor"
     "ui.factor"
 } {

diff --git a/library/ui/cocoa/menu-bar.factor b/library/ui/cocoa/menu-bar.factor
deleted file mode 100644 (file)
index c947c92..0000000
--- a/library/ui/cocoa/menu-bar.factor
+++ /dev/null
@@ -1,143 +0,0 @@
-! Copyright (C) 2005, 2006 Kevin Reid.
-! See http://factorcode.org/license.txt for BSD license.
-USING: cocoa compiler gadgets gadgets-workspace gadgets-help
-gadgets-listener kernel memory objc objc-classes sequences
-strings words io help ;
-IN: cocoa
-
-! -------------------------------------------------------------------------
-
-GENERIC: to-target-and-action ( spec -- target action )
-
-M: f to-target-and-action f swap ;
-M: string to-target-and-action f ;
-M: word to-target-and-action unit to-target-and-action ;
-M: quotation to-target-and-action
-    <FactorCallback> "perform:" swap ;
-
-: <NSMenu> ( title -- menu )
-    NSMenu -> alloc
-    swap <NSString> -> initWithTitle:
-    -> autorelease ;
-
-: set-main-menu ( menu -- ) NSApp swap -> setMainMenu: ;
-
-: <NSMenuItem> ( title action equivalent -- item )
-    >r >r >r
-    NSMenuItem -> alloc
-    r> <NSString>
-    r> dup [ sel_registerName ] when
-    r> <NSString>
-    -> initWithTitle:action:keyEquivalent: -> autorelease ;
-
-: make-menu-item ( title spec -- item )
-    to-target-and-action >r swap <NSMenuItem> dup
-    r> -> setTarget: ;
-
-: submenu-to-item ( menu -- item )
-    dup -> title CF>string f "" <NSMenuItem> dup
-    rot -> setSubmenu: ;
-
-: add-submenu ( menu submenu -- )
-    submenu-to-item -> addItem: ;
-
-: and-modifiers ( item key-equivalent-modifier-mask -- item )
-    dupd -> setKeyEquivalentModifierMask: ;
-
-: and-alternate ( item -- item )
-    dup 1 -> setAlternate: ;
-
-: and-option-equivalent-modifier 1572864 and-modifiers ;
-
-! -------------------------------------------------------------------------
-
-DEFER: described-menu
-
-! { } => separator
-
-! { { ... } } or
-! { { ... } modify-quotation } => submenu as described in inner sequence
-
-! { title action equivalent } or
-! { title action equivalent modify-quotation } => item
-
-! this is a mess
-: described-item ( desc -- menu-item )
-    dup length 0 = [
-        drop NSMenuItem -> separatorItem
-    ] [
-        dup first string? [
-            [ first3 swap make-menu-item ] keep
-            dup length 4 = [ fourth call ] [ drop ] if
-        ] [
-            [ first described-menu ] keep
-            dup length 2 = [ second call ] [ drop ] if
-            submenu-to-item
-        ] if
-    ] if ;
-
-: and-described-item ( menu desc -- same-menu )
-    described-item dupd -> addItem: ;
-
-: described-menu ( { title items* } -- menu )
-    [ first <NSMenu> ] keep
-    1 tail [ and-described-item ] each ;
-
-: and-described-submenu ( menu { title items* } -- menu )
-    described-menu dupd add-submenu ;
-
-! -------------------------------------------------------------------------
-
-: menu-run-file ( -- )
-    open-panel [ listener-run-files ] when* ;
-
-: default-main-menu 
-    {
-        "<top>"
-        { {
-            "Factor"
-            ! About goes here
-            ! Preferences goes here
-            { {
-                "Services"
-            } [ NSApp over -> setServicesMenu: ] }
-            { }
-            { "Hide Factor" "hide:" "h" }
-            { "Hide Others" "hideOtherApplications:" "h" [ and-option-equivalent-modifier ] }
-            { "Show All" "unhideAllApplications:" "" }
-            { }
-            { "Quit" "terminate:" "q" }
-        } [ NSApp over -> setAppleMenu: ] }
-        { {
-            "File"
-            { "New Workspace" [ workspace-window drop ] "n" }
-            { "Run..." menu-run-file "o" }
-            { }
-            { "Save Image" save "s" }
-        } }
-        { {
-            "Edit"
-            { "Undo" "undo:" "z" }
-            { "Redo" "redo:" "Z" }
-            { }
-            { "Cut" "cut:" "x" }
-            { "Copy" "copy:" "c" }
-            { "Paste" "paste:" "v" }
-            { "Delete" "delete:" "" }
-            { "Select All" "selectAll:" "a" }
-            ! Find, Spelling, and Speech submenus go here
-        } }
-        { {
-            "Window"
-            { "Close" "performClose:" "w" }
-            { "Zoom" "performZoom:" "" }
-            { "Minimize" "performMiniaturize:" "m" }
-            { "Minimize All" "miniaturizeAll:" "m"  [ and-alternate and-option-equivalent-modifier ] }
-            { }
-            { "Bring All to Front" "arrangeInFront:" "" }
-        } [ NSApp over -> setWindowsMenu: ] }
-        { {
-            "Help"
-            { "Factor Documentation" [ "handbook" <link> help-gadget call-tool ] "?" }
-        } }
-    } described-menu set-main-menu ;

diff --git a/library/ui/cocoa/ui.factor b/library/ui/cocoa/ui.factor
index e7a455a517755e49e9c79a2c57e33f8e626a68d3..0b06024e6d5f449eca71967b4ad6b54f59866d91 100644 (file)
--- a/library/ui/cocoa/ui.factor
+++ b/library/ui/cocoa/ui.factor
@@ -28,8 +28,7 @@ hashtables kernel memory namespaces objc sequences errors freetype ;
     reset-callbacks
     install-app-delegate
     register-services
-    init-clipboard
-    default-main-menu ;
+    init-clipboard ;
 
 : rect>NSRect
     dup world-loc first2 rot rect-dim first2 <NSRect> ;