X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a92edd311c08a1a19efe3715115d4fc0515c1749..4a28b9b81cafbf10b32dacbdc4fe98944e3ff6c6:/wxPython/demo/wxToolBar.py

diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/wxToolBar.py
index a3c0f69e7d..ad4bfe5ea9 100644
--- a/wxPython/demo/wxToolBar.py
+++ b/wxPython/demo/wxToolBar.py
@@ -16,6 +16,7 @@ class TestToolBar(wxFrame):
         wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
 
         tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT)
+        # wxTB_VERTICAL
         #tb = wxToolBarSimple(self, -1, wxDefaultPosition, wxDefaultSize,
         #               wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
         #self.SetToolBar(tb)
@@ -41,23 +42,24 @@ class TestToolBar(wxFrame):
 
         tb.AddSeparator()
 
-        tool = tb.AddTool(50, images.getTog1Bitmap(),
-                          shortHelpString="Toggle this", isToggle=true)
+        tool = tb.AddCheckTool(50, images.getTog1Bitmap(),
+                               shortHelp="Toggle this")
         EVT_TOOL(self, 50, self.OnToolClick)
 
-        tb.AddTool(60, images.getTog1Bitmap(), images.getTog2Bitmap(),
-                   shortHelpString="Toggle with 2 bitmaps", isToggle=true)
-        EVT_TOOL(self, 60, self.OnToolClick)
+        #tb.AddCheckTool(60, '', images.getTog1Bitmap(), images.getTog2Bitmap(),
+        #                shortHelp="Toggle with 2 bitmaps")
+        #EVT_TOOL(self, 60, self.OnToolClick)
 
         EVT_TOOL_ENTER(self, -1, self.OnToolEnter)
         EVT_TOOL_RCLICKED(self, -1, self.OnToolRClick)  # Match all
         EVT_TIMER(self, -1, self.OnClearSB)
 
-        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)
+        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.Realize()