X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe08e597048268b58f76f240e3f3dff52cdd6ffe..19e30148e18cc99296b26503c155e5cef59045f4:/include/wx/mac/frame.h?ds=sidebyside diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h index c3032d69f0..940b8b957c 100644 --- a/include/wx/mac/frame.h +++ b/include/wx/mac/frame.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: frame.h -// Purpose: wxFrameMac class +// Purpose: wxFrame class // Author: AUTHOR // Modified by: // Created: ??/??/98 // RCS-ID: $Id$ // Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FRAME_H_ @@ -28,14 +28,12 @@ class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxStatusBar; class WXDLLEXPORT wxMacToolTip ; -class WXDLLEXPORT wxFrameMac: public wxFrameBase { - - DECLARE_DYNAMIC_CLASS(wxFrameMac) - +class WXDLLEXPORT wxFrame: public wxFrameBase +{ public: // construction - wxFrameMac() { Init(); } - wxFrameMac(wxWindow *parent, + wxFrame() { Init(); } + wxFrame(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -56,13 +54,13 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual ~wxFrameMac(); + virtual ~wxFrame(); // implementation only from now on // ------------------------------- // override some more virtuals - virtual bool Enable(bool enable) ; + virtual bool Enable(bool enable = TRUE) ; // get the origin of the client area (which may be different from (0, 0) // if the frame has a toolbar) in client coordinates @@ -120,6 +118,7 @@ protected: private: DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxFrame) }; #endif