X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..306f34a3681b0d8d87ac5fb3dfd76817f4a8ba7c:/include/wx/univ/frame.h diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index a6e35a898a..cd75831ca0 100644 --- a/include/wx/univ/frame.h +++ b/include/wx/univ/frame.h @@ -16,7 +16,7 @@ // wxFrame // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: wxFrame() {} @@ -54,14 +54,9 @@ public: virtual wxToolBar* CreateToolBar(long style = -1, wxWindowID id = wxID_ANY, 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(); + virtual wxSize GetMinSize() const; protected: void OnSize(wxSizeEvent& event); @@ -82,6 +77,11 @@ protected: virtual void PositionStatusBar(); #endif // wxUSE_MENUS +protected: +#if wxUSE_TOOLBAR + virtual void PositionToolBar(); +#endif // wxUSE_TOOLBAR + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxFrame) };