X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7810c95b5de52447a5c2c8aaed06f287e02fc690..ea1b0d6ccb7d492f93a4f48f600ae0b6b397cbd7:/include/wx/mac/frame.h diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h index ec02faec6d..c71cf5fee5 100644 --- a/include/wx/mac/frame.h +++ b/include/wx/mac/frame.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: frame.h -// Purpose: wxFrame class +// Purpose: wxFrameMac class // Author: AUTHOR // Modified by: // Created: ??/??/98 @@ -28,14 +28,14 @@ class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxStatusBar; class WXDLLEXPORT wxMacToolTip ; -class WXDLLEXPORT wxFrame: public wxFrameBase { +class WXDLLEXPORT wxFrameMac: public wxFrameBase { - DECLARE_DYNAMIC_CLASS(wxFrame) + DECLARE_DYNAMIC_CLASS(wxFrameMac) public: // construction - wxFrame() { Init(); } - wxFrame(wxWindow *parent, + wxFrameMac() { Init(); } + wxFrameMac(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -56,7 +56,7 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual ~wxFrame(); + virtual ~wxFrameMac(); // implement base class pure virtuals virtual void Maximize(bool maximize = TRUE); @@ -64,7 +64,6 @@ public: virtual void Iconize(bool iconize = TRUE); virtual bool IsIconized() const; virtual void Restore(); - virtual void SetMenuBar(wxMenuBar *menubar); virtual void SetIcon(const wxIcon& icon); // implementation only from now on