X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb0f373c99a98633a1a9125f6eac632a0ceafe9d..71aba8333cc915afff9e740c944f7fa7247abacb:/wxPython/demo/wxToolBar.py?ds=sidebyside

diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/wxToolBar.py
index ad4bfe5ea9..b80030b795 100644
--- a/wxPython/demo/wxToolBar.py
+++ b/wxPython/demo/wxToolBar.py
@@ -7,23 +7,28 @@ 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)
-        # wxTB_VERTICAL
+        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)
 
@@ -46,26 +51,28 @@ class TestToolBar(wxFrame):
                                shortHelp="Toggle this")
         EVT_TOOL(self, 50, self.OnToolClick)
 
-        #tb.AddCheckTool(60, '', images.getTog1Bitmap(), images.getTog2Bitmap(),
-        #                shortHelp="Toggle with 2 bitmaps")
-        #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)
 
-        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()
 
 
     def OnToolClick(self, event):
         self.log.WriteText("tool %s clicked\n" % event.GetId())
+        tb = self.GetToolBar()
+        tb.EnableTool(10, not tb.GetToolEnabled(10))
 
     def OnToolRClick(self, event):
         self.log.WriteText("tool %s right-clicked\n" % event.GetId())
@@ -100,7 +107,7 @@ class TestToolBar(wxFrame):
 def runTest(frame, nb, log):
     win = TestToolBar(frame, log)
     frame.otherWin = win
-    win.Show(true)
+    win.Show(True)
 
 #---------------------------------------------------------------------------
 
@@ -109,16 +116,15 @@ def runTest(frame, nb, log):
 
 
 
+overview = """\
 
+"""
 
 
 
 
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
 
-
-
-
-
-overview = """\
-
-"""