X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b88201ff5f0f9ed18db555b70eb7123c8a7c9c6..9243700fb212c2508c4d4c80fb8eb968e565e44d:/include/wx/mac/carbon/toolbar.h

diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h
index 62c91785e1..95987b58a0 100644
--- a/include/wx/mac/carbon/toolbar.h
+++ b/include/wx/mac/carbon/toolbar.h
@@ -17,7 +17,7 @@
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxToolBarNameStr[];
 
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
@@ -57,7 +57,10 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
 
     virtual void SetRows(int nRows);
 
-  // Add all the buttons
+    virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+    virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+
+    // Add all the buttons
 
     virtual wxString MacGetToolTipString( wxPoint &where ) ;
     void OnPaint(wxPaintEvent& event) ;
@@ -90,7 +93,8 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);
 
     DECLARE_EVENT_TABLE()
 #if wxMAC_USE_NATIVE_TOOLBAR