X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9f12f3b9f997b6308faf336d5381be591b71f4..14f8fa9d7fa07b02c276981d135ce73cf6818879:/include/wx/gtk1/frame.h?ds=sidebyside diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index ec5261621e..0a14bb20c3 100644 --- a/include/wx/gtk1/frame.h +++ b/include/wx/gtk1/frame.h @@ -11,7 +11,7 @@ #ifndef __GTKFRAMEH__ #define __GTKFRAMEH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "frame.h" #endif @@ -27,15 +27,15 @@ class wxToolBar; class wxStatusBar; //----------------------------------------------------------------------------- -// wxFrameGTK +// wxFrame //----------------------------------------------------------------------------- -class wxFrameGTK : public wxFrameBase +class wxFrame : public wxFrameBase { public: // construction - wxFrameGTK() { Init(); } - wxFrameGTK(wxWindow *parent, + wxFrame() { Init(); } + wxFrame(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 ~wxFrameGTK(); + virtual ~wxFrame(); #if wxUSE_STATUSBAR virtual void PositionStatusBar(); @@ -73,6 +73,8 @@ public: const wxString& name = wxToolBarNameStr); void SetToolBar(wxToolBar *toolbar); #endif // wxUSE_TOOLBAR + + wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } // implementation from now on // -------------------------- @@ -96,6 +98,8 @@ protected: virtual void DetachMenuBar(); virtual void AttachMenuBar(wxMenuBar *menubar); #endif // wxUSE_MENUS_NATIVE + + DECLARE_DYNAMIC_CLASS(wxFrame) }; #endif // __GTKFRAMEH__