Shell Script file to copy setup.h for ProjectBuilder

[wxWidgets.git] / wxPython / demo / wxToolBar.py

diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/wxToolBar.py
index 9867b98f051ee36ae2c78bb0ae2f2cc89c8bbd33..a22833e37ae4fbe8965b8e0cb0081da1089b7ea2 100644 (file)
--- a/wxPython/demo/wxToolBar.py
+++ b/wxPython/demo/wxToolBar.py
@@ -23,6 +23,8 @@ class TestToolBar(wxFrame):
         #               wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
         #self.SetToolBar(tb)
 
+        log.write("Default toolbar tool size: %s\n" % tb.GetToolBitmapSize())
+
         self.CreateStatusBar()
 
         tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
@@ -57,12 +59,12 @@ class TestToolBar(wxFrame):
         EVT_TOOL_RCLICKED(self, -1, self.OnToolRClick)  # Match all
         EVT_TIMER(self, -1, self.OnClearSB)
 
-        if wxPlatform != "__WXMAC__":
-            tb.AddSeparator()
-            cbID = wxNewId()
-            tb.AddControl(wxComboBox(tb, cbID, "", choices=["", "This", "is a", "wxComboBox"],
-                                     size=(150,-1), style=wxCB_DROPDOWN))
-            EVT_COMBOBOX(self, cbID, self.OnCombo)
+        tb.AddSeparator()
+        cbID = wxNewId()
+        tb.AddControl(wxComboBox(tb, cbID, "", choices=["", "This", "is a", "wxComboBox"],
+                                 size=(150,-1), style=wxCB_DROPDOWN))
+        EVT_COMBOBOX(self, cbID, self.OnCombo)
+        tb.AddControl(wxTextCtrl(tb, -1, "Toolbar controls!!", size=(150, -1)))
 
         tb.Realize()