added operators for comparing wxString to wxCStrData

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

diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h
index 527c97e7931724c35f70266d0a7ce318d91d53bf..00d7309b30aadf4272425372375d3a5f92e3e7bc 100644 (file)
--- a/include/wx/mac/carbon/toolbar.h
+++ b/include/wx/mac/carbon/toolbar.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        toolbar.h
+// Name:        wx/mac/carbon/toolbar.h

 // Purpose:     wxToolBar class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxToolBar class
 // Author:      Stefan Csomor
 // Modified by:


@@ -57,7 +57,10 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
 
     virtual void SetRows(int nRows);
 
 
     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) ;
 
     virtual wxString MacGetToolTipString( wxPoint &where ) ;
     void OnPaint(wxPaintEvent& event) ;


@@ -90,12 +93,13 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);

-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);

 
     DECLARE_EVENT_TABLE()
 
     DECLARE_EVENT_TABLE()

-#if wxMAC_USE_NATIVE_TOOLBAR    
-       bool m_macUsesNativeToolbar ;
-       void* m_macHIToolbarRef ;
+#if wxMAC_USE_NATIVE_TOOLBAR
+    bool m_macUsesNativeToolbar ;
+    void* m_macHIToolbarRef ;

 #endif
 };
 
 #endif
 };