X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b90345be1e457f02b96ff7fde2bfc9b8d100de2..3874d10d85573aa240b80068837a98eea82dcb7e:/include/wx/gtk1/frame.h diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index a1745d7f69..70bb8392b6 100644 --- a/include/wx/gtk1/frame.h +++ b/include/wx/gtk1/frame.h @@ -62,8 +62,6 @@ public: virtual bool Show( bool show ); virtual void Centre( int direction = wxHORIZONTAL ); - virtual void GetClientSize( int *width, int *height ) const; - virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0, const wxString& name = _T("statusBar")); virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id, @@ -108,13 +106,14 @@ public: virtual void OnInternalIdle(); wxMenuBar *m_frameMenuBar; - wxMenuBar *m_mdiMenuBar; wxStatusBar *m_frameStatusBar; wxToolBar *m_frameToolBar; wxString m_title; wxIcon m_icon; int m_miniEdge,m_miniTitle; GtkWidget *m_mainWidget; + bool m_menuBarDetached; + bool m_toolBarDetached; protected: virtual void DoSetSize(int x, int y, @@ -122,6 +121,7 @@ protected: int sizeFlags = wxSIZE_AUTO); virtual void DoSetClientSize(int width, int height); + virtual void DoGetClientSize( int *width, int *height ) const; private: DECLARE_EVENT_TABLE()