X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f514ab45900ae08326c70cf7d360377bbf14ea4..26ee65c723cf55822c540506f064ec11d9b26858:/wxPython/src/_toolbar.i?ds=sidebyside diff --git a/wxPython/src/_toolbar.i b/wxPython/src/_toolbar.i index f7e886494e..629b1b2c36 100644 --- 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); };