Applied wxGauge:Pulse() patch.

[wxWidgets.git] / include / wx / mac / carbon / toolbar.h

diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h
index a5fb9c3b85c50283df6e5615e346a697853bec26..527c97e7931724c35f70266d0a7ce318d91d53bf 100644 (file)
--- 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);
   }
     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,
 
   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 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);
     virtual bool Realize();
 
     virtual void SetToolBitmapSize(const wxSize& size);


@@ -75,7 +73,8 @@ protected:
     // common part of all ctors
     void Init();
 
     // 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);
 
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);