X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9f12f3b9f997b6308faf336d5381be591b71f4..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/gtk1/frame.h?ds=sidebyside diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index ec5261621e..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,35 +7,30 @@ // 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; //----------------------------------------------------------------------------- -// wxFrameGTK +// wxFrame //----------------------------------------------------------------------------- -class wxFrameGTK : public wxFrameBase +class WXDLLIMPEXP_CORE 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,24 +51,28 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual ~wxFrameGTK(); + virtual ~wxFrame(); #if wxUSE_STATUSBAR 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 // -------------------------- @@ -82,6 +81,7 @@ public: virtual void OnInternalIdle(); bool m_menuBarDetached; + int m_menuBarHeight; bool m_toolBarDetached; protected: @@ -93,9 +93,17 @@ 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) }; #endif // __GTKFRAMEH__