X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4765d335f603c29f1fd300288ff1d40a118fcf0e..36d9119341753b2f6f606571702a9b906050a07c:/include/wx/mac/toolbar.h

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index 63c3d7f937..2bc339b013 100644
--- a/include/wx/mac/toolbar.h
+++ b/include/wx/mac/toolbar.h
@@ -59,7 +59,11 @@ 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) ;
+	virtual void MacSuperChangedPosition() ;
 protected:
     // common part of all ctors
     void Init();
@@ -73,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 ;