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 2110fb88e296622930c2d67dac73980b0f00e26a..a22833e37ae4fbe8965b8e0cb0081da1089b7ea2 100644 (file)
--- a/wxPython/demo/wxToolBar.py
+++ b/wxPython/demo/wxToolBar.py
@@ -7,47 +7,53 @@ import images
 
 class TestToolBar(wxFrame):
     def __init__(self, parent, log):
-        wxFrame.__init__(self, parent, -1, 'Test ToolBar',
-                         wxPoint(0,0), wxSize(500, 300))
+        wxFrame.__init__(self, parent, -1, 'Test ToolBar', size=(500, 300))
         self.log = log
         self.timer = None
         EVT_CLOSE(self, self.OnCloseWindow)
 
         wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
 
-        tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT)
+        tb = self.CreateToolBar( wxTB_HORIZONTAL
+                                 | wxNO_BORDER
+                                 | wxTB_FLAT
+                                 | wxTB_TEXT
+                                 )
         #tb = wxToolBarSimple(self, -1, wxDefaultPosition, wxDefaultSize,
         #               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'")
+        #tb.AddLabelTool(10, "New", images.getNewBitmap(), shortHelp="New", longHelp="Long help for 'New'")
         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
@@ -58,6 +64,7 @@ class TestToolBar(wxFrame):
         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()
 
@@ -75,6 +82,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()
 
@@ -96,7 +105,7 @@ class TestToolBar(wxFrame):
 def runTest(frame, nb, log):
     win = TestToolBar(frame, log)
     frame.otherWin = win
-    win.Show(true)
+    win.Show(True)
 
 #---------------------------------------------------------------------------
 
@@ -105,16 +114,15 @@ def runTest(frame, nb, log):
 
 
 
+overview = """\
 
+"""
 
 
 
 
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
 
-
-
-
-
-overview = """\
-
-"""