Override CocoaSetEnabled. NSProgressIndicator is not an NSControl.

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

diff --git a/include/wx/cocoa/frame.h b/include/wx/cocoa/frame.h
index 02e19ed615d0626125d4648bf7eeeb90a8fade81..91b212a2576ff18009ef100b43524356bbb27025 100644 (file)
--- a/include/wx/cocoa/frame.h
+++ b/include/wx/cocoa/frame.h
@@ -13,7 +13,6 @@
 #define _WX_COCOA_FRAME_H_
 
 class WXDLLEXPORT wxMenuBar;
 #define _WX_COCOA_FRAME_H_
 
 class WXDLLEXPORT wxMenuBar;

-class WXDLLEXPORT wxMenuItem;

 class WXDLLEXPORT wxStatusBar;
 
 class WXDLLEXPORT wxFrame: public wxFrameBase 
 class WXDLLEXPORT wxStatusBar;
 
 class WXDLLEXPORT wxFrame: public wxFrameBase 


@@ -51,8 +50,10 @@ protected:
 // ------------------------------------------------------------------------
 // Cocoa specifics
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Cocoa specifics
 // ------------------------------------------------------------------------

+public:
+    virtual wxMenuBar* GetAppMenuBar() { return GetMenuBar(); }

 protected:
 protected:

-    virtual void Cocoa_wxMenuItemAction(wxMenuItem& item);
+    virtual void CocoaSetWxWindowSize(int width, int height);

 
     // Helper function to position status/tool bars
     void UpdateFrameNSView();
 
     // Helper function to position status/tool bars
     void UpdateFrameNSView();


@@ -64,14 +65,14 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
 // 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
 
     // 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
 
     // get the origin of the client area (which may be different from (0, 0)
     // if the frame has a toolbar) in client coordinates


@@ -85,17 +86,16 @@ public:
                                             wxStatusLineNameStr);
     // sets the main status bar
     void SetStatusBar(wxStatusBar *statBar);
                                             wxStatusLineNameStr);
     // sets the main status bar
     void SetStatusBar(wxStatusBar *statBar);

+#if wxUSE_TOOLBAR

     // create main toolbar bycalling OnCreateToolBar()
     virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID winid = -1,
                                      const wxString& name = wxToolBarNameStr);
     // sets the main tool bar
     virtual void SetToolBar(wxToolBar *toolbar);
     // create main toolbar bycalling OnCreateToolBar()
     virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID winid = -1,
                                      const wxString& name = wxToolBarNameStr);
     // sets the main tool bar
     virtual void SetToolBar(wxToolBar *toolbar);

+#endif //wxUSE_TOOLBAR

 protected:
     void PositionStatusBar();
 protected:
     void PositionStatusBar();

-    // override base class virtuals
-    virtual void DoGetClientSize(int *width, int *height) const;
-    virtual void DoSetClientSize(int width, int height);

 };
 
 #endif // _WX_COCOA_FRAME_H_
 };
 
 #endif // _WX_COCOA_FRAME_H_