A few tweaks and cleanups

[wxWidgets.git] / include / wx / mac / toolbar.h

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index 7b7c38456fa7ae02dfec2b16e5b43cb3eb7085f5..2bc339b0136583f4dea899a8037b66476d625bd9 100644 (file)
--- 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
 
 
   // 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 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,
     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,
                                           wxObject *clientData,

-                                          const wxString& shortHelpString,
-                                          const wxString& longHelpString);
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);

     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
        wxArrayPtrVoid  m_macToolHandles ;
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
        wxArrayPtrVoid  m_macToolHandles ;