X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa992c594e2bc490ff2ccd34bd8b4963150c33ff..8ba1644391f9fd8fa7f2d2a9c102cd78a1d799cb:/include/wx/cocoa/NSWindow.h diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h index 8f73ba3267..9bbecf9fec 100644 --- a/include/wx/cocoa/NSWindow.h +++ b/include/wx/cocoa/NSWindow.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_NSWINDOW_H__ @@ -17,6 +17,12 @@ WX_DECLARE_OBJC_HASHMAP(NSWindow); +class WXDLLIMPEXP_FWD_CORE wxMenuBar; +class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowCocoa; + +DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem); +DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate); + class wxCocoaNSWindow { /* NSWindow is a rather special case and requires some extra attention */ @@ -24,12 +30,26 @@ class wxCocoaNSWindow public: void AssociateNSWindow(WX_NSWindow cocoaNSWindow); void DisassociateNSWindow(WX_NSWindow cocoaNSWindow); - virtual void Cocoa_close(void) = 0; + virtual bool Cocoa_canBecomeKeyWindow(bool &canBecome) + { return false; } + 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 void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) = 0; + virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) = 0; + virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win); + inline wxTopLevelWindowCocoa* GetWxTopLevelWindowCocoa() + { return m_wxTopLevelWindowCocoa; } protected: - static struct objc_object *sm_cocoaDelegate; + wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw = NULL); + virtual ~wxCocoaNSWindow(); + WX_wxNSWindowDelegate m_cocoaDelegate; + wxTopLevelWindowCocoa *m_wxTopLevelWindowCocoa; }; #endif // _WX_COCOA_NSWINDOW_H_