X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/720e01c312b9a7ee493d649656bcc875eaf5acb6..4c663122e48dfd9eca0170b0e56541efc211c996:/include/wx/cocoa/NSWindow.h diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h index 29748141c9..3bf28f62e0 100644 --- a/include/wx/cocoa/NSWindow.h +++ b/include/wx/cocoa/NSWindow.h @@ -17,6 +17,8 @@ WX_DECLARE_OBJC_HASHMAP(NSWindow); +class WXDLLEXPORT wxMenuBar; + class wxCocoaNSWindow { /* NSWindow is a rather special case and requires some extra attention */ @@ -24,13 +26,17 @@ class wxCocoaNSWindow public: void AssociateNSWindow(WX_NSWindow cocoaNSWindow); void DisassociateNSWindow(WX_NSWindow cocoaNSWindow); - virtual void Cocoa_close(void) = 0; - virtual bool Cocoa_windowShouldClose(void) = 0; - virtual void Cocoa_wxMenuItemAction(wxMenuItem& item) = 0; - virtual void CocoaNotification_DidBecomeKey(void) { } - virtual void CocoaNotification_DidResignKey(void) { } + virtual bool Cocoa_canBecomeMainWindow(bool &canBecome) + { return false; } + virtual bool CocoaDelegate_windowShouldClose(void) = 0; + virtual void CocoaDelegate_windowWillClose(void) = 0; + virtual void CocoaDelegate_windowDidBecomeKey(void) { } + virtual void CocoaDelegate_windowDidResignKey(void) { } + virtual void CocoaDelegate_windowDidBecomeMain(void) { } + virtual void CocoaDelegate_windowDidResignMain(void) { } + virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win); protected: - static void *sm_cocoaObserver; + static struct objc_object *sm_cocoaDelegate; }; #endif // _WX_COCOA_NSWINDOW_H_