X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d66b09982c9cadc20f9abcf9e2bdc804ffa877a..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/gtk/frame.h diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index 726cce187b..98addeee04 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -10,17 +10,6 @@ #ifndef _WX_GTK_FRAME_H_ #define _WX_GTK_FRAME_H_ -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; -class WXDLLIMPEXP_FWD_CORE wxMenu; -class WXDLLIMPEXP_FWD_CORE wxMenuBar; -class WXDLLIMPEXP_FWD_CORE wxToolBar; -class WXDLLIMPEXP_FWD_CORE wxStatusBar; - //----------------------------------------------------------------------------- // wxFrame //----------------------------------------------------------------------------- @@ -54,18 +43,10 @@ public: virtual ~wxFrame(); #if wxUSE_STATUSBAR - virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, - wxWindowID id = 0, - const wxString& name = wxStatusLineNameStr); - void SetStatusBar(wxStatusBar *statbar); #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR - virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID id = -1, - const wxString& name = wxToolBarNameStr); void SetToolBar(wxToolBar *toolbar); #endif // wxUSE_TOOLBAR @@ -76,34 +57,18 @@ public: // -------------------------- // GTK callbacks - virtual void GtkOnSize(); virtual void OnInternalIdle(); - bool m_menuBarDetached; - int m_menuBarHeight; - bool m_toolBarDetached; - protected: // common part of all ctors void Init(); -#if wxUSE_STATUSBAR - virtual void PositionStatusBar(); -#endif // wxUSE_STATUSBAR - // override wxWindow methods to take into account tool/menu/statusbars virtual void DoGetClientSize( int *width, int *height ) const; #if wxUSE_MENUS_NATIVE virtual void DetachMenuBar(); virtual void AttachMenuBar(wxMenuBar *menubar); - // Whether frame has a menubar showing - // (needed to deal with perverted MDI menubar handling) - virtual bool HasVisibleMenubar() const; - -public: - // Menu size is dynamic now, call this whenever it might change. - void UpdateMenuBarSize(); #endif // wxUSE_MENUS_NATIVE private: