X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/857dab7dcd7cb95dfabbe63761064b8dc949a5ef..7d3f6b4ded6aa412cb1cc306fef478955d448c5b:/include/wx/univ/frame.h diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index 4419dea5bd..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 WXDLLEXPORT wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: wxFrame() {} @@ -44,28 +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 = wxST_SIZEGRIP, + 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 = wxNO_BORDER|wxTB_HORIZONTAL, - wxWindowID id = -1, + virtual wxToolBar* CreateToolBar(long style = -1, + wxWindowID id = wxID_ANY, const wxString& name = wxToolBarNameStr); - virtual void PositionToolBar(); #endif // wxUSE_TOOLBAR + virtual wxSize GetMinSize() const; + protected: void OnSize(wxSizeEvent& event); - - // sends wxSizeEvent to itself (used after attaching xxxBar) - void SendSizeEvent(); + void OnSysColourChanged(wxSysColourChangedEvent& event); virtual void DoGetClientSize(int *width, int *height) const; virtual void DoSetClientSize(int width, int height); @@ -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) };