X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk/frame.h diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index 3befcf231f..98addeee04 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -7,30 +7,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKFRAMEH__ -#define __GTKFRAMEH__ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "frame.h" -#endif - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxMDIChildFrame; -class wxMDIClientWindow; -class wxMenu; -class wxMenuBar; -class wxToolBar; -class wxStatusBar; +#ifndef _WX_GTK_FRAME_H_ +#define _WX_GTK_FRAME_H_ //----------------------------------------------------------------------------- // wxFrame //----------------------------------------------------------------------------- -class wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction @@ -59,56 +43,38 @@ public: virtual ~wxFrame(); #if wxUSE_STATUSBAR - virtual void PositionStatusBar(); - - 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 - + + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } // implementation from now on // -------------------------- // GTK callbacks - virtual void GtkOnSize( int x, int y, int width, int height ); virtual void OnInternalIdle(); - bool m_menuBarDetached; - int m_menuBarHeight; - bool m_toolBarDetached; - protected: // common part of all ctors void Init(); // override wxWindow methods to take into account tool/menu/statusbars - virtual void DoSetClientSize(int width, int height); virtual void DoGetClientSize( int *width, int *height ) const; #if wxUSE_MENUS_NATIVE - virtual void DetachMenuBar(); virtual void AttachMenuBar(wxMenuBar *menubar); - -public: - // Menu size is dynamic now, call this whenever it might change. - void UpdateMenuBarSize(); - #endif // wxUSE_MENUS_NATIVE +private: + long m_fsSaveFlag; + DECLARE_DYNAMIC_CLASS(wxFrame) }; -#endif // __GTKFRAMEH__ +#endif // _WX_GTK_FRAME_H_