X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c12de7f83ada39e1f80d8bb55a893177e928153c..88568e48e4bacf62a9a7fb70a0df6a54222b89fc:/wxPython/demo/wxFloatBar.py

diff --git a/wxPython/demo/wxFloatBar.py b/wxPython/demo/wxFloatBar.py
index 5a7afb92eb..c218731bb4 100644
--- a/wxPython/demo/wxFloatBar.py
+++ b/wxPython/demo/wxFloatBar.py
@@ -1,53 +1,73 @@
-from wxPython.wx import *
-from wxPython.lib.floatbar import *
-
-import images
-
-
-class TestFloatBar(wxFrame):
+# 11/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# o OK, Main.py indicates this is deprecated. But I don't see a 
+#   replacement yet. So conversion is done anyway.
+#
+# 11/28/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Issues - library has to be converted to work properly
+#   with new namespace.
+#
+# 12/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wxFloatBar -> FloatBar
+#
+
+import  wx
+import  wx.lib.floatbar
+
+import  images
+
+
+class TestFloatBar(wx.Frame):
     def __init__(self, parent, log):
-        wxFrame.__init__(self, parent, -1, 'Test ToolBar',
-                         wxPoint(0,0), wxSize(500, 300))
+        wx.Frame.__init__(
+            self, parent, -1, 'Test ToolBar', wx.DefaultPosition, (500, 300)
+            )
+
         self.log = log
 
-        win = wxWindow(self, -1)
-        win.SetBackgroundColour(wxNamedColour("WHITE"))
-        wxStaticText(win, -1, "Drag the toolbar to float it,\n"
-                     "Toggle the last tool to remove\nthe title.", wxPoint(15,15))
+        win = wx.Window(self, -1)
+        win.SetBackgroundColour("WHITE")
+        wx.StaticText(
+            win, -1, "Drag the toolbar to float it,\n"  
+            "Toggle the last tool to remove\nthe title.", (15,15)
+            )
 
-        tb = wxFloatBar(self, -1)
+        tb = wx.lib.floatbar.FloatBar(self, -1)
         self.SetToolBar(tb)
         tb.SetFloatable(1)
         tb.SetTitle("Floating!")
         self.CreateStatusBar()
 
-        tb.AddSimpleTool(10, '', images.getNewBitmap(), "New", "Long help for 'New'")
-        EVT_TOOL(self, 10, self.OnToolClick)
-        EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
+        tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
+        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")
-        EVT_TOOL(self, 20, self.OnToolClick)
-        EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
+        tb.AddSimpleTool(20, images.getOpenBitmap(), "Open")
+        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")
-        EVT_TOOL(self, 30, self.OnToolClick)
-        EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
+        tb.AddSimpleTool(30, images.getCopyBitmap(), "Copy")
+        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")
-        EVT_TOOL(self, 40, self.OnToolClick)
-        EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
+        tb.AddSimpleTool(40, images.getPasteBitmap(), "Paste")
+        self.Bind(wx.EVT_TOOL, self.OnToolClick, id=40)
+        self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=40)
 
         tb.AddSeparator()
 
+        tb.AddCheckTool(60, images.getTog1Bitmap(), images.getTog2Bitmap())
+        self.Bind(wx.EVT_TOOL, self.OnToolClick, id=60)
+        self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=60)
 
-        tb.AddCheckTool(60, '', images.getTog1Bitmap(), images.getTog2Bitmap())
-        EVT_TOOL(self, 60, self.OnToolClick)
-        EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)
         tb.Realize()
 
         self.tb = tb
-        EVT_CLOSE(self, self.OnCloseWindow)
+        self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
 
 
     def OnCloseWindow(self, event):
@@ -55,8 +75,10 @@ class TestFloatBar(wxFrame):
 
     def OnToolClick(self, event):
         self.log.WriteText("tool %s clicked\n" % event.GetId())
+
         if event.GetId() == 60:
-            print event.GetExtraLong(), event.Checked(), event.GetInt(), self.tb.GetToolState(60)
+            print event.GetExtraLong(), event.IsChecked(), event.GetInt(), self.tb.GetToolState(60)
+
             if event.GetExtraLong():
                 self.tb.SetTitle("")
             else:
@@ -70,20 +92,23 @@ class TestFloatBar(wxFrame):
 def runTest(frame, nb, log):
     win = TestFloatBar(frame, log)
     frame.otherWin = win
-    win.Show(true)
+    win.Show(True)
 
 #---------------------------------------------------------------------------
 
 overview = """\
-wxFloatBar is a subclass of wxToolBar, implemented in Python, which can be detached from its frame.
+FloatBar is a subclass of wx.ToolBar, implemented in Python, which
+can be detached from its frame.
 
-Drag the toolbar with the mouse to make it float, and drag it back, or close it to make the toolbar return to its original position.
+Drag the toolbar with the mouse to make it float, and drag it back, or
+close it to make the toolbar return to its original position.
 
 """
 
-
-
-
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])