X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/univ/frame.h diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index e30d470a49..d53d940e1b 100644 --- a/include/wx/univ/frame.h +++ b/include/wx/univ/frame.h @@ -12,10 +12,6 @@ #ifndef _WX_UNIV_FRAME_H_ #define _WX_UNIV_FRAME_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univframe.h" -#endif - // ---------------------------------------------------------------------------- // wxFrame // ---------------------------------------------------------------------------- @@ -44,7 +40,7 @@ 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, @@ -56,19 +52,18 @@ public: #if wxUSE_TOOLBAR // create main toolbar bycalling OnCreateToolBar() virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxString& name = wxToolBarNameStr); - virtual void PositionToolBar(); #endif // wxUSE_TOOLBAR - virtual int GetMinWidth() const; - virtual int GetMinHeight() const; + virtual wxSize GetMinSize() const; // sends wxSizeEvent to itself (used after attaching xxxBar) virtual void SendSizeEvent(); protected: void OnSize(wxSizeEvent& event); + void OnSysColourChanged(wxSysColourChangedEvent& event); virtual void DoGetClientSize(int *width, int *height) const; virtual void DoSetClientSize(int width, int height); @@ -85,6 +80,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) };