Always use XPMs in this sample

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

diff --git a/include/wx/cocoa/frame.h b/include/wx/cocoa/frame.h
index 0cea7dbac31e0fda19dfcb2e70c95b745f9cc542..d5aa49436ca002a8f46a7b3b7609d88e2b82da8c 100644 (file)
--- a/include/wx/cocoa/frame.h
+++ b/include/wx/cocoa/frame.h
@@ -51,14 +51,15 @@ protected:
 // Cocoa specifics
 // ------------------------------------------------------------------------
 public:
 // Cocoa specifics
 // ------------------------------------------------------------------------
 public:

-    virtual wxMenuBar* GetAppMenuBar() { return GetMenuBar(); }
+    virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);

     // Returns the NSView for non-client drawing
     virtual WX_NSView GetNonClientNSView();
     // Returns the NSView for non-client drawing
     virtual WX_NSView GetNonClientNSView();

-protected:
-    virtual void CocoaSetWxWindowSize(int width, int height);

 
     // Helper function to position status/tool bars
 
     // Helper function to position status/tool bars

+    // Also called by native toolbar to force a size update

     void UpdateFrameNSView();
     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
 
     virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView);
     // frameNSView is used whenever a statusbar/generic toolbar are present