X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..fa8bc37bc20613e53136f26882aee31e11bef131:/include/wx/mac/carbon/frame.h diff --git a/include/wx/mac/carbon/frame.h b/include/wx/mac/carbon/frame.h index 14314745e8..306c9ff2ec 100644 --- a/include/wx/mac/carbon/frame.h +++ b/include/wx/mac/carbon/frame.h @@ -72,7 +72,6 @@ public: wxWindowID id = -1, const wxString& name = wxToolBarNameStr); - virtual void PositionToolBar(); virtual void SetToolBar(wxToolBar *toolbar); #endif // wxUSE_TOOLBAR @@ -82,8 +81,6 @@ public: long style = wxST_SIZEGRIP, wxWindowID id = 0, const wxString& name = wxStatusLineNameStr); - - virtual void PositionStatusBar(); #endif // wxUSE_STATUSBAR // tooltip management @@ -97,10 +94,19 @@ public: void SetLastFocus(wxWindow *win) { m_winLastFocused = win; } wxWindow *GetLastFocus() const { return m_winLastFocused; } + void PositionBars(); + protected: // common part of all ctors void Init(); +#if wxUSE_TOOLBAR + virtual void PositionToolBar(); +#endif +#if wxUSE_STATUSBAR + virtual void PositionStatusBar(); +#endif + // override base class virtuals virtual void DoGetClientSize(int *width, int *height) const; virtual void DoSetClientSize(int width, int height);