X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d2412f77b875fe3c5b29e5b09286819c46f8e6c..ca7b163fc2f9a3ea016a812dcb8be162c1ebb79b:/include/wx/cocoa/frame.h

diff --git a/include/wx/cocoa/frame.h b/include/wx/cocoa/frame.h
index 5190e59c41..d5aa49436c 100644
--- a/include/wx/cocoa/frame.h
+++ b/include/wx/cocoa/frame.h
@@ -13,7 +13,6 @@
 #define _WX_COCOA_FRAME_H_
 
 class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxMenuItem;
 class WXDLLEXPORT wxStatusBar;
 
 class WXDLLEXPORT wxFrame: public wxFrameBase 
@@ -51,12 +50,16 @@ protected:
 // ------------------------------------------------------------------------
 // Cocoa specifics
 // ------------------------------------------------------------------------
-protected:
-    virtual void Cocoa_wxMenuItemAction(wxMenuItem& item);
-    virtual void CocoaSetWxWindowSize(int width, int height);
+public:
+    virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
+    // Returns the NSView for non-client drawing
+    virtual WX_NSView GetNonClientNSView();
 
     // Helper function to position status/tool bars
+    // Also called by native toolbar to force a size update
     void UpdateFrameNSView();
+protected:
+    virtual void CocoaSetWxWindowSize(int width, int height);
 
     virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView);
     // frameNSView is used whenever a statusbar/generic toolbar are present
@@ -65,14 +68,14 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
-    void AttachMenuBar(wxMenuBar *mbar);
-    void DetachMenuBar();
+    virtual void AttachMenuBar(wxMenuBar *mbar);
+    virtual void DetachMenuBar();
+    virtual void SetMenuBar(wxMenuBar *menubar);
 
     // implementation only from now on
     // -------------------------------
 
     // override some more virtuals
-    virtual bool Show( bool show = true );
 
     // get the origin of the client area (which may be different from (0, 0)
     // if the frame has a toolbar) in client coordinates