check for wxUSE_TIMER in headers, not the files including them

[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 a5fb9c3b85c50283df6e5615e346a697853bec26..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:


@@ -37,7 +37,7 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
     Init();
     Create(parent, id, pos, size, style, name);
   }
     Init();
     Create(parent, id, pos, size, style, name);
   }

-  ~wxToolBar();
+  virtual ~wxToolBar();

 
   bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxNO_BORDER|wxTB_HORIZONTAL,
 
   bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxNO_BORDER|wxTB_HORIZONTAL,


@@ -50,8 +50,6 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
 
     virtual bool Show(bool show = true);
     virtual bool IsShown() const;
 
     virtual bool Show(bool show = true);
     virtual bool IsShown() const;

-    virtual void DoGetSize(int *width, int *height) const;
-    virtual wxSize DoGetBestSize() const ;

     virtual bool Realize();
 
     virtual void SetToolBitmapSize(const wxSize& size);
     virtual bool Realize();
 
     virtual void SetToolBitmapSize(const wxSize& size);


@@ -59,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) ;


@@ -75,7 +76,8 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    // implement base class pure virtuals
+    virtual void DoGetSize(int *width, int *height) const;
+    virtual wxSize DoGetBestSize() const;

     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
 
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
 


@@ -91,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
 };