adding OS level Window Menu by default

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

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 0b2491e70cb8b01e31c8711b9efc780979d3b335..c25113a98e68278ece76c22424bf640194ed7d10 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSWINDOW_H__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSWINDOW_H__


@@ -18,7 +18,9 @@
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
 class WXDLLEXPORT wxMenuBar;
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
 class WXDLLEXPORT wxMenuBar;

+class WXDLLEXPORT wxTopLevelWindowCocoa;

 
 

+DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);

 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
 
 class wxCocoaNSWindow
 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
 
 class wxCocoaNSWindow


@@ -36,13 +38,16 @@ public:
     virtual void CocoaDelegate_windowDidResignKey(void) { }
     virtual void CocoaDelegate_windowDidBecomeMain(void) { }
     virtual void CocoaDelegate_windowDidResignMain(void) { }
     virtual void CocoaDelegate_windowDidResignKey(void) { }
     virtual void CocoaDelegate_windowDidBecomeMain(void) { }
     virtual void CocoaDelegate_windowDidResignMain(void) { }

-    virtual void CocoaDelegate_wxMenuItemAction(struct objc_object *sender) = 0;
-    virtual bool CocoaDelegate_validateMenuItem(struct objc_object *sender) = 0;
+    virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) = 0;
+    virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) = 0;

     virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
     virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);

+    inline wxTopLevelWindowCocoa* GetWxTopLevelWindowCocoa()
+    {   return m_wxTopLevelWindowCocoa; }

 protected:
 protected:

-    wxCocoaNSWindow();
+    wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw = NULL);

     virtual ~wxCocoaNSWindow();
     WX_wxNSWindowDelegate m_cocoaDelegate;
     virtual ~wxCocoaNSWindow();
     WX_wxNSWindowDelegate m_cocoaDelegate;

+    wxTopLevelWindowCocoa *m_wxTopLevelWindowCocoa;

 };
 
 #endif // _WX_COCOA_NSWINDOW_H_
 };
 
 #endif // _WX_COCOA_NSWINDOW_H_