Add wxCONTROL_FLAT

[wxWidgets.git] / wxPython / src / _toolbar.i

diff --git a/wxPython/src/_toolbar.i b/wxPython/src/_toolbar.i
index f7e886494e5b22de7a68fa2bfc8c6e1227926e91..629b1b2c366c336f064cd4e1ebc703c75e0a7b76 100644 (file)
--- a/wxPython/src/_toolbar.i
+++ b/wxPython/src/_toolbar.i
@@ -325,8 +325,10 @@ public:
     %Rename(AddToolItem,  wxToolBarToolBase*, AddTool (wxToolBarToolBase *tool));
     %Rename(InsertToolItem,  wxToolBarToolBase*, InsertTool (size_t pos, wxToolBarToolBase *tool));
 
-    wxToolBarToolBase *AddControl(wxControl *control);
-    wxToolBarToolBase *InsertControl(size_t pos, wxControl *control);
+    wxToolBarToolBase *AddControl(wxControl *control,
+                                  const wxString& label = wxEmptyString);
+    wxToolBarToolBase *InsertControl(size_t pos, wxControl *control,
+                                     const wxString& label = wxEmptyString);
     wxControl *FindControl( int id );
 
     wxToolBarToolBase *AddSeparator();
@@ -442,6 +444,10 @@ public:
               long style = wxNO_BORDER | wxTB_HORIZONTAL,
               const wxString& name = wxPyToolBarNameStr);
 
+    // TODO: In 2.9 move these to the base class...
+    void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+    void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+    
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };