X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbd321ffc2d4e7f9e45c72af9e3f824fa9ccda51..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/mac/carbon/toolbar.h diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h index 7673d04a43..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 { @@ -93,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