start of alpha transparency support

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

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 7899208435fb0eda43995904d5d8866645bec4c6..9e885dfab73f9904279a82f8f8ed7c130dac8139 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
 
@@ -234,6 +234,8 @@ protected:
     // short and long help strings
     wxString m_shortHelpString;
     wxString m_longHelpString;
+
+    DECLARE_NO_COPY_CLASS(wxToolBarToolBase)
 };
 
 // a list of toolbar tools
@@ -322,6 +324,9 @@ public:
                                     wxObject *clientData = NULL
                                );
 
+    virtual wxToolBarToolBase *AddTool (wxToolBarToolBase *tool);
+    virtual wxToolBarToolBase *InsertTool (size_t pos, wxToolBarToolBase *tool);
+
     // add an arbitrary control to the toolbar, return TRUE if ok (notice that
     // the control will be deleted by the toolbar and that it will also adjust
     // its position/size)
@@ -329,6 +334,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();