changed wxPlatform implicit conversion to string to return const reference to wxStrin...

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

diff --git a/wxPython/src/_toolbar.i b/wxPython/src/_toolbar.i
index 65a1b76af621cf4e0dfb50d5cdec890998073328..3180b8e5150188fe95cb56998d5d56848e08de84 100644 (file)
--- a/wxPython/src/_toolbar.i
+++ b/wxPython/src/_toolbar.i
@@ -34,6 +34,11 @@ enum wxToolBarToolStyle
 enum {
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,
+    wxTB_TOP,
+    wxTB_LEFT,
+    wxTB_BOTTOM,
+    wxTB_RIGHT,
+
     wxTB_3DBUTTONS,
     wxTB_FLAT,
     wxTB_DOCKABLE,
@@ -43,7 +48,7 @@ enum {
     wxTB_NOALIGN,
     wxTB_HORZ_LAYOUT,
     wxTB_HORZ_TEXT,
-    wxTB_NO_TOOLTIPS,
+    wxTB_NO_TOOLTIPS
 };
 
 
@@ -437,6 +442,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);
 };