X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98363307d3b0c8c4f3182b9a82d7f87ca06a1a82..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/univ/frame.h diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index 371a024bb4..4f13277f1e 100644 --- a/include/wx/univ/frame.h +++ b/include/wx/univ/frame.h @@ -20,37 +20,69 @@ // wxFrame // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) -#define wxFrameNative wxFrameMSW -#elif defined(__WXGTK__) -#define wxFrameNative wxFrameGTK -#elif defined(__WXMGL__) -#define wxFrameNative wxFrameMGL -#elif defined(__WXMAC__) -#define wxFrameNative wxFrameMac -#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 ); + 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; + + // sends wxSizeEvent to itself (used after attaching xxxBar) + virtual void SendSizeEvent(); protected: void OnSize(wxSizeEvent& event); + 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()