X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/mac/carbon/frame.h diff --git a/include/wx/mac/carbon/frame.h b/include/wx/mac/carbon/frame.h index 104a622b0f..3119b143fe 100644 --- a/include/wx/mac/carbon/frame.h +++ b/include/wx/mac/carbon/frame.h @@ -17,8 +17,7 @@ #include "wx/accel.h" #include "wx/icon.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; +WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[]; class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxStatusBar; @@ -72,7 +71,6 @@ public: wxWindowID id = -1, const wxString& name = wxToolBarNameStr); - virtual void PositionToolBar(); virtual void SetToolBar(wxToolBar *toolbar); #endif // wxUSE_TOOLBAR @@ -82,25 +80,25 @@ public: long style = wxST_SIZEGRIP, wxWindowID id = 0, const wxString& name = wxStatusLineNameStr); - - virtual void PositionStatusBar(); #endif // wxUSE_STATUSBAR - // tooltip management -#if wxUSE_TOOLTIPS - wxMacToolTip* GetToolTipCtrl() const { return m_hwndToolTip; } - void SetToolTipCtrl(wxMacToolTip *tt) { m_hwndToolTip = tt; } - wxMacToolTip* m_hwndToolTip ; -#endif // tooltips - // called by wxWindow whenever it gets focus 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);