X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d53fc3442b92a52dd24a40fee6a201c1b931987..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/gtk1/frame.h diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index 662886cf68..1f7af6336b 100644 --- a/include/wx/gtk1/frame.h +++ b/include/wx/gtk1/frame.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/frame.h +// Name: wx/gtk1/frame.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,30 +7,25 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKFRAMEH__ #define __GTKFRAMEH__ -#ifdef __GNUG__ - #pragma interface "frame.h" -#endif - //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class wxMDIChildFrame; -class wxMDIClientWindow; -class wxMenu; -class wxMenuBar; -class wxToolBar; -class wxStatusBar; +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 //----------------------------------------------------------------------------- -class wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction @@ -62,18 +57,20 @@ public: virtual void PositionStatusBar(); virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = wxST_SIZEGRIP, + long style = wxSTB_DEFAULT_STYLE, wxWindowID id = 0, const wxString& name = wxStatusLineNameStr); + + void SetStatusBar(wxStatusBar *statbar); #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR - virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT, + virtual wxToolBar* CreateToolBar(long style = -1, wxWindowID id = -1, const wxString& name = wxToolBarNameStr); void SetToolBar(wxToolBar *toolbar); #endif // wxUSE_TOOLBAR - + wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } // implementation from now on @@ -84,6 +81,7 @@ public: virtual void OnInternalIdle(); bool m_menuBarDetached; + int m_menuBarHeight; bool m_toolBarDetached; protected: @@ -95,8 +93,14 @@ protected: 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 DECLARE_DYNAMIC_CLASS(wxFrame)