X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/944930d5f525ffa2d10b7cefb1ecacaf1e95275c..0b7e6e7da208b6a95fb23cb50286a09dc90d96d2:/utils/wxPython/demo/wxFloatBar.py

diff --git a/utils/wxPython/demo/wxFloatBar.py b/utils/wxPython/demo/wxFloatBar.py
index 48c85f4a3d..0936ac224d 100644
--- a/utils/wxPython/demo/wxFloatBar.py
+++ b/utils/wxPython/demo/wxFloatBar.py
@@ -10,31 +10,31 @@ class TestFloatBar(wxFrame):
         win = wxWindow(self, -1)
         win.SetBackgroundColour(wxNamedColour("WHITE"))
         wxStaticText(win, -1, "Drag the toolbar to float it,\n"
-                     "Toggle the last tool to remove the title.", wxPoint(15,15))
+                     "Toggle the last tool to remove\nthe title.", wxPoint(15,15))
 
         tb = wxFloatBar(self, -1)
         self.SetToolBar(tb)
         tb.SetFloatable(1)
         tb.SetTitle("Floating!")
         self.CreateStatusBar()
-        tb.AddTool(10, wxBitmap('bitmaps/new.bmp',   wxBITMAP_TYPE_BMP),
-                        wxNullBitmap, false, -1, -1, "New", "Long help for 'New'")
+        tb.AddSimpleTool(10, wxBitmap('bitmaps/new.bmp',   wxBITMAP_TYPE_BMP),
+                         "New", "Long help for 'New'")
         EVT_TOOL(self, 10, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
 
-        tb.AddTool(20, wxBitmap('bitmaps/open.bmp',  wxBITMAP_TYPE_BMP),
-                        wxNullBitmap, false, -1, -1, "Open")
+        tb.AddSimpleTool(20, wxBitmap('bitmaps/open.bmp',  wxBITMAP_TYPE_BMP),
+                         "Open")
         EVT_TOOL(self, 20, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
 
         tb.AddSeparator()
-        tb.AddTool(30, wxBitmap('bitmaps/copy.bmp',  wxBITMAP_TYPE_BMP),
-                        wxNullBitmap, false, -1, -1, "Copy")
+        tb.AddSimpleTool(30, wxBitmap('bitmaps/copy.bmp',  wxBITMAP_TYPE_BMP),
+                         "Copy")
         EVT_TOOL(self, 30, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
 
-        tb.AddTool(40, wxBitmap('bitmaps/paste.bmp', wxBITMAP_TYPE_BMP),
-                        wxNullBitmap, false, -1, -1, "Paste")
+        tb.AddSimpleTool(40, wxBitmap('bitmaps/paste.bmp', wxBITMAP_TYPE_BMP),
+                         "Paste")
         EVT_TOOL(self, 40, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
 
@@ -42,8 +42,8 @@ class TestFloatBar(wxFrame):
 
 
         tb.AddTool(60, wxBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
-                        wxBitmap('bitmaps/tog2.bmp', wxBITMAP_TYPE_BMP),
-                        true, -1, -1, "Toggle with 2 bitmaps")
+                   wxBitmap('bitmaps/tog2.bmp', wxBITMAP_TYPE_BMP),
+                   shortHelpString="Toggle with 2 bitmaps", toggle=true)
         EVT_TOOL(self, 60, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)
         tb.Realize()
@@ -57,6 +57,7 @@ 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)
             if event.GetExtraLong():
                 self.tb.SetTitle("")
             else: