X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9152a05f8132181caa920309fba63c3784f8c71..c2a738e372126950e5c70f72a3e8876f1ac89bf5:/include/wx/univ/frame.h diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index 9a64bb8733..207bf0d6b0 100644 --- a/include/wx/univ/frame.h +++ b/include/wx/univ/frame.h @@ -12,15 +12,11 @@ #ifndef _WX_UNIV_FRAME_H_ #define _WX_UNIV_FRAME_H_ -#ifdef __GNUG__ - #pragma interface "univframe.h" -#endif - // ---------------------------------------------------------------------------- // wxFrame // ---------------------------------------------------------------------------- -class wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: wxFrame() {} @@ -34,7 +30,7 @@ public: { Create(parent, id, title, pos, size, style, name); } - + bool Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -44,10 +40,27 @@ public: const wxString& name = wxFrameNameStr); virtual wxPoint GetClientAreaOrigin() const; - virtual bool Enable(bool enable = TRUE); + virtual bool Enable(bool enable = true); + +#if wxUSE_STATUSBAR + virtual wxStatusBar* CreateStatusBar(int number = 1, + long style = wxSTB_DEFAULT_STYLE, + wxWindowID id = 0, + const wxString& name = wxStatusLineNameStr); +#endif // wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR + // create main toolbar bycalling OnCreateToolBar() + virtual wxToolBar* CreateToolBar(long style = -1, + wxWindowID id = wxID_ANY, + const wxString& name = wxToolBarNameStr); +#endif // wxUSE_TOOLBAR + + virtual wxSize GetMinSize() const; protected: void OnSize(wxSizeEvent& event); + void OnSysColourChanged(wxSysColourChangedEvent& event); virtual void DoGetClientSize(int *width, int *height) const; virtual void DoSetClientSize(int width, int height); @@ -55,8 +68,20 @@ protected: #if wxUSE_MENUS // override to update menu bar position when the frame size changes virtual void PositionMenuBar(); + virtual void DetachMenuBar(); + virtual void AttachMenuBar(wxMenuBar *menubar); #endif // wxUSE_MENUS +#if wxUSE_STATUSBAR + // override to update statusbar position when the frame size changes + virtual void PositionStatusBar(); +#endif // wxUSE_MENUS + +protected: +#if wxUSE_TOOLBAR + virtual void PositionToolBar(); +#endif // wxUSE_TOOLBAR + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxFrame) };