X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96bfd05319f9e393843e84ca5274d85ff248bad4..3f4f90c2a0c1f274d1918b320132ed0ca2922fe5:/wxPython/demo/wxFloatBar.py?ds=sidebyside diff --git a/wxPython/demo/wxFloatBar.py b/wxPython/demo/wxFloatBar.py index ad3057584e..5a7afb92eb 100644 --- a/wxPython/demo/wxFloatBar.py +++ b/wxPython/demo/wxFloatBar.py @@ -21,28 +21,27 @@ class TestFloatBar(wxFrame): tb.SetTitle("Floating!") self.CreateStatusBar() - tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'") + 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(20, images.getOpenBitmap(), "Open") + tb.AddSimpleTool(20, '', images.getOpenBitmap(), "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") 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") EVT_TOOL(self, 40, self.OnToolClick) EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick) tb.AddSeparator() - tb.AddTool(60, images.getTog1Bitmap(), images.getTog2Bitmap(), - shortHelpString="Toggle with 2 bitmaps", isToggle=true) + tb.AddCheckTool(60, '', images.getTog1Bitmap(), images.getTog2Bitmap()) EVT_TOOL(self, 60, self.OnToolClick) EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick) tb.Realize() @@ -65,8 +64,6 @@ class TestFloatBar(wxFrame): def OnToolRClick(self, event): self.log.WriteText("tool %s right-clicked\n" % event.GetId()) - # def test(self, event): - # self.log.WriteText("Button clicked!") #---------------------------------------------------------------------------