From 7e8a08cdd88c7f483cdca35d259e49c1abc6e049 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 19 Sep 2010 09:39:22 -0600 Subject: [PATCH] cocoa toolbar button and some unimplemented clean-up --- collects/mred/private/wx/cocoa/frame.rkt | 21 ++++++++++++++++++--- collects/mred/private/wx/cocoa/menu-bar.rkt | 1 - collects/mred/private/wx/gtk/filedialog.rkt | 6 ------ collects/mred/private/wx/gtk/frame.rkt | 4 ---- collects/mred/private/wx/gtk/menu-bar.rkt | 1 - collects/mred/private/wx/win32/frame.rkt | 3 --- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/collects/mred/private/wx/cocoa/frame.rkt b/collects/mred/private/wx/cocoa/frame.rkt index e0a6da453d..76d206bb71 100644 --- a/collects/mred/private/wx/cocoa/frame.rkt +++ b/collects/mred/private/wx/cocoa/frame.rkt @@ -21,9 +21,11 @@ ;; ---------------------------------------- (import-class NSWindow NSGraphicsContext NSMenu NSPanel - NSApplication NSAutoreleasePool NSScreen) + NSApplication NSAutoreleasePool NSScreen + NSToolbar) (define NSWindowCloseButton 0) +(define NSWindowToolbarButton 3) (define front #f) @@ -81,7 +83,14 @@ (send empty-mb install) (send wx notify-responder #f) (queue-window-event wx (lambda () - (send wx on-activate #f))))))]) + (send wx on-activate #f))))))] + [-a _void (toggleToolbarShown: [_id sender]) + (when wxb + (let ([wx (->wx wxb)]) + (when wx + (queue-window-event wx + (lambda () (send wx on-toolbar-click)))))) + (void)]) (define-objc-class MyWindow NSWindow #:mixins (FocusResponder KeyMouseResponder MyWindowMethods) @@ -156,6 +165,12 @@ (define cocoa (get-cocoa)) (tellv cocoa setDelegate: cocoa) + (when (memq 'toolbar-button style) + (atomically + (let ([tb (tell (tell NSToolbar alloc) initWithIdentifier: #:type _NSString "Ok")]) + (tellv cocoa setToolbar: tb) + (tellv tb setVisible: #:type _BOOL #f)))) + (move -11111 (if (= y -11111) 0 y)) (tellv cocoa setAcceptsMouseMovedEvents: #:type _BOOL #t) @@ -459,7 +474,7 @@ (define/public (on-menu-click) (void)) - (def/public-unimplemented on-toolbar-click) + (define/public (on-toolbar-click) (void)) (def/public-unimplemented on-menu-command) (def/public-unimplemented on-mdi-activate) (def/public-unimplemented on-close) diff --git a/collects/mred/private/wx/cocoa/menu-bar.rkt b/collects/mred/private/wx/cocoa/menu-bar.rkt index 1facf8d91a..e72947f966 100644 --- a/collects/mred/private/wx/cocoa/menu-bar.rkt +++ b/collects/mred/private/wx/cocoa/menu-bar.rkt @@ -119,7 +119,6 @@ (defclass menu-bar% object% (define menus null) - (def/public-unimplemented number) (define/public (enable-top pos on?) (set-box! (cddr (list-ref menus pos)) on?) (when (eq? current-mb this) diff --git a/collects/mred/private/wx/gtk/filedialog.rkt b/collects/mred/private/wx/gtk/filedialog.rkt index c26bd77b6d..535ae8292c 100644 --- a/collects/mred/private/wx/gtk/filedialog.rkt +++ b/collects/mred/private/wx/gtk/filedialog.rkt @@ -138,9 +138,3 @@ (free-immobile-cell cell) ;; FIXME : don't leak (gtk_widget_hide dlg-gtk) (unbox response-box))) - -(define (id-to-menu-item i) i) -(define-unimplemented get-the-x-selection) -(define-unimplemented get-the-clipboard) -(define-unimplemented show-print-setup) -(define (can-show-print-setup?) #f) diff --git a/collects/mred/private/wx/gtk/frame.rkt b/collects/mred/private/wx/gtk/frame.rkt index d35ac5332a..7cf3642df1 100644 --- a/collects/mred/private/wx/gtk/frame.rkt +++ b/collects/mred/private/wx/gtk/frame.rkt @@ -371,10 +371,6 @@ (set! is-modified? (and mod? #t)) (set-title saved-title))) - (define/public (create-status-line) (void)) - (define/public (set-status-text s) (void)) - (def/public-unimplemented status-line-exists?) - (define waiting-cursor? #f) (define/public (set-wait-cursor-mode on?) (set! waiting-cursor? on?) diff --git a/collects/mred/private/wx/gtk/menu-bar.rkt b/collects/mred/private/wx/gtk/menu-bar.rkt index 183d99ae34..4771e446b2 100644 --- a/collects/mred/private/wx/gtk/menu-bar.rkt +++ b/collects/mred/private/wx/gtk/menu-bar.rkt @@ -114,7 +114,6 @@ (gtk_label_set_text_with_mnemonic (gtk_bin_get_child item-gtk) (fixup-mneumonic str))))) - (def/public-unimplemented number) (def/public-unimplemented enable-top) (define/public (delete which pos) diff --git a/collects/mred/private/wx/win32/frame.rkt b/collects/mred/private/wx/win32/frame.rkt index a9553e4020..4d9053addf 100644 --- a/collects/mred/private/wx/win32/frame.rkt +++ b/collects/mred/private/wx/win32/frame.rkt @@ -16,12 +16,9 @@ (def/public-unimplemented designate-root-frame) (def/public-unimplemented system-menu) (def/public-unimplemented set-modified) - (def/public-unimplemented create-status-line) (def/public-unimplemented is-maximized?) (def/public-unimplemented maximize) - (def/public-unimplemented status-line-exists?) (def/public-unimplemented iconized?) - (def/public-unimplemented set-status-text) (def/public-unimplemented get-menu-bar) (def/public-unimplemented set-menu-bar) (def/public-unimplemented set-icon)