X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c257d44dd201f502a0e9a4bcff95958c6cd28182..19e30148e18cc99296b26503c155e5cef59045f4:/include/wx/mac/toolbar.h?ds=inline diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h index 7b7c38456f..2bc339b013 100644 --- a/include/wx/mac/toolbar.h +++ b/include/wx/mac/toolbar.h @@ -59,7 +59,7 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase // Add all the buttons - virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ; + virtual void MacHandleControlClick( WXWidget control , short controlpart ) ; virtual wxString MacGetToolTipString( wxPoint &where ) ; void OnPaint(wxPaintEvent& event) ; void OnMouse(wxMouseEvent& event) ; @@ -77,12 +77,13 @@ protected: virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); virtual wxToolBarToolBase *CreateTool(int id, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - bool toggle, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString); + const wxString& shortHelp, + const wxString& longHelp); virtual wxToolBarToolBase *CreateTool(wxControl *control); wxArrayPtrVoid m_macToolHandles ;