X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62e8fcee74577090533c875337b7f30840687372..c4f8516517e13bf164809c9d58d701413807f8c1:/wxPython/demo/wxToolBar.py

diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/wxToolBar.py
index b80030b795..b609061504 100644
--- a/wxPython/demo/wxToolBar.py
+++ b/wxPython/demo/wxToolBar.py
@@ -1,27 +1,35 @@
+# 11/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 
 
-from wxPython.wx import *
-
-import images
+import  wx
+import  images
 
 #---------------------------------------------------------------------------
 
-class TestToolBar(wxFrame):
+class TestToolBar(wx.Frame):
     def __init__(self, parent, log):
-        wxFrame.__init__(self, parent, -1, 'Test ToolBar', size=(500, 300))
+        wx.Frame.__init__(self, parent, -1, 'Test ToolBar', size=(500, 300))
         self.log = log
         self.timer = None
-        EVT_CLOSE(self, self.OnCloseWindow)
+        self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
 
-        wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
+        wx.Window(self, -1).SetBackgroundColour(wx.NamedColour("WHITE"))
 
-        tb = self.CreateToolBar( wxTB_HORIZONTAL
-                                 | wxNO_BORDER
-                                 | wxTB_FLAT
-                                 | wxTB_TEXT
+        # Use the wxFrame internals to create the toolbar and associate it all
+        # in one tidy method call.
+        tb = self.CreateToolBar( wx.TB_HORIZONTAL
+                                 | wx.NO_BORDER
+                                 | wx.TB_FLAT
+                                 | wx.TB_TEXT
                                  )
-        #tb = wxToolBarSimple(self, -1, wxDefaultPosition, wxDefaultSize,
-        #               wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
+
+        # Here's a 'simple' toolbar example, and how to bind it using SetToolBar()
+        #tb = wx.ToolBarSimple(self, -1, wx.DefaultPosition, wx.DefaultSize,
+        #               wx.TB_HORIZONTAL | wx.NO_BORDER | wx.TB_FLAT)
         #self.SetToolBar(tb)
+        # But we're doing it a different way here.
 
         log.write("Default toolbar tool size: %s\n" % tb.GetToolBitmapSize())
 
@@ -29,43 +37,50 @@ class TestToolBar(wxFrame):
 
         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)
+        self.Bind(wx.EVT_TOOL, self.OnToolClick, id=10)
+        self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=10)
 
         tb.AddSimpleTool(20, images.getOpenBitmap(), "Open", "Long help for 'Open'")
-        EVT_TOOL(self, 20, self.OnToolClick)
-        EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
+        self.Bind(wx.EVT_TOOL, self.OnToolClick, id=20)
+        self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=20)
 
         tb.AddSeparator()
         tb.AddSimpleTool(30, images.getCopyBitmap(), "Copy", "Long help for 'Copy'")
-        EVT_TOOL(self, 30, self.OnToolClick)
-        EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
+        self.Bind(wx.EVT_TOOL, self.OnToolClick, id=30)
+        self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=30)
 
         tb.AddSimpleTool(40, images.getPasteBitmap(), "Paste", "Long help for 'Paste'")
-        EVT_TOOL(self, 40, self.OnToolClick)
-        EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
+        self.Bind(wx.EVT_TOOL, self.OnToolClick, id=40)
+        self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=40)
 
         tb.AddSeparator()
 
         tool = tb.AddCheckTool(50, images.getTog1Bitmap(),
                                shortHelp="Toggle this")
-        EVT_TOOL(self, 50, self.OnToolClick)
+        self.Bind(wx.EVT_TOOL, self.OnToolClick, id=50)
 
 ##         tb.AddCheckTool(60, images.getTog1Bitmap(), images.getTog2Bitmap(),
 ##                         shortHelp="Toggle with 2 bitmaps")
-##         EVT_TOOL(self, 60, self.OnToolClick)
+##         self.Bind(EVT_TOOL, self.OnToolClick, id=60)
 
-        EVT_TOOL_ENTER(self, -1, self.OnToolEnter)
-        EVT_TOOL_RCLICKED(self, -1, self.OnToolRClick)  # Match all
-        EVT_TIMER(self, -1, self.OnClearSB)
+        self.Bind(wx.EVT_TOOL_ENTER, self.OnToolEnter)
+        self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick) # Match all
+        self.Bind(wx.EVT_TIMER, 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)
-        tb.AddControl(wxTextCtrl(tb, -1, "Toolbar controls!!", size=(150, -1)))
-
+        cbID = wx.NewId()
+
+        tb.AddControl(
+            wx.ComboBox(
+                tb, cbID, "", choices=["", "This", "is a", "wxComboBox"],
+                size=(150,-1), style=wx.CB_DROPDOWN
+                ))
+                
+        self.Bind(wx.EVT_COMBOBOX, self.OnCombo, id=cbID)
+        tb.AddControl(wx.TextCtrl(tb, -1, "Toolbar controls!!", size=(150, -1)))
+
+        # Final thing to do for a toolbar is call the Realize() method. This
+        # causes it to render (more or less, that is).
         tb.Realize()
 
 
@@ -82,10 +97,13 @@ class TestToolBar(wxFrame):
 
     def OnToolEnter(self, event):
         self.log.WriteText('OnToolEnter: %s, %s\n' % (event.GetId(), event.GetInt()))
+
         if self.timer is None:
-            self.timer = wxTimer(self)
+            self.timer = wx.Timer(self)
+
         if self.timer.IsRunning():
             self.timer.Stop()
+
         self.timer.Start(2000)
         event.Skip()
 
@@ -113,16 +131,11 @@ def runTest(frame, nb, log):
 
 
 
-
-
-
 overview = """\
 
 """
 
 
-
-
 if __name__ == '__main__':
     import sys,os
     import run