Lots more Unicode fixes.

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

diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/wxToolBar.py
index 2110fb88e296622930c2d67dac73980b0f00e26a..ad4bfe5ea994797cc5e5db7bebd6b7244062e765 100644 (file)
--- 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)
@@ -26,38 +27,39 @@ class TestToolBar(wxFrame):
         EVT_TOOL(self, 10, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
 
-        tb.AddSimpleTool(20, images.getOpenBitmap(), "Open")
+        tb.AddSimpleTool(20, images.getOpenBitmap(), "Open", "Long help for 'Open'")
         EVT_TOOL(self, 20, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
 
         tb.AddSeparator()
-        tb.AddSimpleTool(30, images.getCopyBitmap(), "Copy")
+        tb.AddSimpleTool(30, images.getCopyBitmap(), "Copy", "Long help for 'Copy'")
         EVT_TOOL(self, 30, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
 
-        tb.AddSimpleTool(40, images.getPasteBitmap(), "Paste")
+        tb.AddSimpleTool(40, images.getPasteBitmap(), "Paste", "Long help for 'Paste'")
         EVT_TOOL(self, 40, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
 
         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()
 
@@ -75,6 +77,8 @@ class TestToolBar(wxFrame):
         self.log.WriteText('OnToolEnter: %s, %s\n' % (event.GetId(), event.GetInt()))
         if self.timer is None:
             self.timer = wxTimer(self)
+        if self.timer.IsRunning():
+            self.timer.Stop()
         self.timer.Start(2000)
         event.Skip()