X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e56d25204f03b9046f883f37f00e890b7b643fe6..81853b98619293be66074d74d2557973c0f3ab21:/include/wx/mac/carbon/toolbar.h

diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h
index 37b328b246..ee979c767e 100644
--- a/include/wx/mac/carbon/toolbar.h
+++ b/include/wx/mac/carbon/toolbar.h
@@ -12,16 +12,12 @@
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "toolbar.h"
-#endif
-
 #if wxUSE_TOOLBAR
 
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
 
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
@@ -54,7 +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 bool Realize();
 
     virtual void SetToolBitmapSize(const wxSize& size);
@@ -78,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);