Notebook, Listbox, and Checklst updates

[wxWidgets.git] / include / wx / tbarbase.h

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 1ba060a4364779f0db6626419455181c19f92b9b..c96bef2acf9279b59487e3fe0a6050815808b5e3 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "tbarbase.h"
 #endif
 
@@ -178,7 +178,7 @@ public:
     void SetNormalBitmap(const wxBitmap& bmp) { m_bmpNormal = bmp; }
     void SetDisabledBitmap(const wxBitmap& bmp) { m_bmpDisabled = bmp; }
 
-    void SetLabel(const wxString& label) { m_label = label; }
+    virtual void SetLabel(const wxString& label) { m_label = label; }
 
     void SetClientData(wxObject *clientData)
     {
@@ -329,6 +329,9 @@ public:
     // NB: the control should have toolbar as its parent
     virtual wxToolBarToolBase *AddControl(wxControl *control);
     virtual wxToolBarToolBase *InsertControl(size_t pos, wxControl *control);
+    
+    // get the control with the given id or return NULL
+    virtual wxControl *FindControl( int id );
 
     // add a separator to the toolbar
     virtual wxToolBarToolBase *AddSeparator();