X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..bc55104d9ab0b0b835644f17a152b4fbbfa8c7b9:/include/wx/univ/frame.h?ds=sidebyside diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index 608296c560..a181bba996 100644 --- a/include/wx/univ/frame.h +++ b/include/wx/univ/frame.h @@ -20,34 +20,69 @@ // wxFrame // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) -#define wxFrameNative wxFrameMSW -#elif defined(__WXGTK__) -#define wxFrameNative wxFrameGTK -#elif defined(__WXMGL__) -#define wxFrameNative wxFrameMGL -#endif - -class wxFrame : public wxFrameNative +class WXDLLEXPORT wxFrame : public wxFrameBase { public: - wxFrame(); + wxFrame() {} wxFrame(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); + const wxString& name = wxFrameNameStr) + { + Create(parent, id, title, pos, size, style, name); + } + + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr); virtual wxPoint GetClientAreaOrigin() const; + virtual bool Enable(bool enable = TRUE); + +#if wxUSE_STATUSBAR + virtual wxStatusBar* CreateStatusBar(int number = 1, + long style = wxST_SIZEGRIP, + wxWindowID id = 0, + const wxString& name = wxStatusLineNameStr); +#endif // wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR + // create main toolbar bycalling OnCreateToolBar() + virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, + wxWindowID id = -1, + const wxString& name = wxToolBarNameStr); + virtual void PositionToolBar(); +#endif // wxUSE_TOOLBAR + + virtual int GetMinWidth() const; + virtual int GetMinHeight() const; protected: void OnSize(wxSizeEvent& event); + // sends wxSizeEvent to itself (used after attaching xxxBar) + void SendSizeEvent(); + + virtual void DoGetClientSize(int *width, int *height) const; + virtual void DoSetClientSize(int width, int height); + #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 DECLARE_EVENT_TABLE()