X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..fe8635a7e78715344f0f4b6abc9d797931429333:/include/wx/mac/carbon/toolbar.h diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h index a5fb9c3b85..527c97e793 100644 --- a/include/wx/mac/carbon/toolbar.h +++ b/include/wx/mac/carbon/toolbar.h @@ -37,7 +37,7 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase Init(); Create(parent, id, pos, size, style, name); } - ~wxToolBar(); + virtual ~wxToolBar(); bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER|wxTB_HORIZONTAL, @@ -50,8 +50,6 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase virtual bool Show(bool show = true); virtual bool IsShown() const; - virtual void DoGetSize(int *width, int *height) const; - virtual wxSize DoGetBestSize() const ; virtual bool Realize(); virtual void SetToolBitmapSize(const wxSize& size); @@ -75,7 +73,8 @@ protected: // common part of all ctors void Init(); - // implement base class pure virtuals + virtual void DoGetSize(int *width, int *height) const; + virtual wxSize DoGetBestSize() const; virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);