use HasFlag() and InXXX() instead of explicit flag testing (patch 899507)

[wxWidgets.git] / include / wx / cocoa / NSWindow.h

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index b0c87c8f2b6343c9926c9b4166a4e5a2fc9b9f77..761b28ee0852823b14681190eaaf6b77a44f5406 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -17,6 +17,11 @@
 
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
+class WXDLLEXPORT wxMenuBar;
+
+DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
+DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
+
 class wxCocoaNSWindow
 {
 /* NSWindow is a rather special case and requires some extra attention */
@@ -32,8 +37,13 @@ public:
     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);
 protected:
-    static struct objc_object *sm_cocoaDelegate;
+    wxCocoaNSWindow();
+    virtual ~wxCocoaNSWindow();
+    WX_wxNSWindowDelegate m_cocoaDelegate;
 };
 
 #endif // _WX_COCOA_NSWINDOW_H_