X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24c7767fc8e093be0f0790c78daeb12b4e58579b..28efe6544f28ba7b37a77c033901fdd6f3978b82:/include/wx/cocoa/frame.h?ds=sidebyside diff --git a/include/wx/cocoa/frame.h b/include/wx/cocoa/frame.h index 91b212a257..c7f886ade5 100644 --- a/include/wx/cocoa/frame.h +++ b/include/wx/cocoa/frame.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COCOA_FRAME_H_ @@ -15,7 +15,7 @@ class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxStatusBar; -class WXDLLEXPORT wxFrame: public wxFrameBase +class WXDLLEXPORT wxFrame: public wxFrameBase { DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxFrame) @@ -51,13 +51,19 @@ protected: // Cocoa specifics // ------------------------------------------------------------------------ public: - virtual wxMenuBar* GetAppMenuBar() { return GetMenuBar(); } -protected: - virtual void CocoaSetWxWindowSize(int width, int height); + 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(); + virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem); + virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem); +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 WX_NSView m_frameNSView; @@ -89,7 +95,7 @@ public: #if wxUSE_TOOLBAR // create main toolbar bycalling OnCreateToolBar() virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID winid = -1, + wxWindowID winid = wxID_ANY, const wxString& name = wxToolBarNameStr); // sets the main tool bar virtual void SetToolBar(wxToolBar *toolbar);