fixed array tests compilation and a bug in obj array test

[wxWidgets.git] / wxPython / demo / wxFloatBar.py

diff --git a/wxPython/demo/wxFloatBar.py b/wxPython/demo/wxFloatBar.py
index 4d0547bd51e594080cceb8d4f697434c6c727745..5a7afb92eb8d1a8793e21776a8b80704fa4e5704 100644 (file)
--- a/wxPython/demo/wxFloatBar.py
+++ b/wxPython/demo/wxFloatBar.py
@@ -1,6 +1,9 @@
 from wxPython.wx import *
 from wxPython.lib.floatbar import *
 
 from wxPython.wx import *
 from wxPython.lib.floatbar import *
 

+import images
+
+

 class TestFloatBar(wxFrame):
     def __init__(self, parent, log):
         wxFrame.__init__(self, parent, -1, 'Test ToolBar',
 class TestFloatBar(wxFrame):
     def __init__(self, parent, log):
         wxFrame.__init__(self, parent, -1, 'Test ToolBar',


@@ -17,33 +20,28 @@ class TestFloatBar(wxFrame):
         tb.SetFloatable(1)
         tb.SetTitle("Floating!")
         self.CreateStatusBar()
         tb.SetFloatable(1)
         tb.SetTitle("Floating!")
         self.CreateStatusBar()

-        tb.AddSimpleTool(10, wxBitmap('bitmaps/new.bmp',   wxBITMAP_TYPE_BMP),
-                         "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)
 
         EVT_TOOL(self, 10, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
 

-        tb.AddSimpleTool(20, wxBitmap('bitmaps/open.bmp',  wxBITMAP_TYPE_BMP),
-                         "Open")
+        tb.AddSimpleTool(20, '', images.getOpenBitmap(), "Open")

         EVT_TOOL(self, 20, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
 
         tb.AddSeparator()
         EVT_TOOL(self, 20, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
 
         tb.AddSeparator()

-        tb.AddSimpleTool(30, wxBitmap('bitmaps/copy.bmp',  wxBITMAP_TYPE_BMP),
-                         "Copy")
+        tb.AddSimpleTool(30, '', images.getCopyBitmap(), "Copy")

         EVT_TOOL(self, 30, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
 
         EVT_TOOL(self, 30, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
 

-        tb.AddSimpleTool(40, wxBitmap('bitmaps/paste.bmp', wxBITMAP_TYPE_BMP),
-                         "Paste")
+        tb.AddSimpleTool(40, '', images.getPasteBitmap(), "Paste")

         EVT_TOOL(self, 40, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
 
         tb.AddSeparator()
 
 
         EVT_TOOL(self, 40, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
 
         tb.AddSeparator()
 
 

-        tb.AddTool(60, wxBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
-                   wxBitmap('bitmaps/tog2.bmp', wxBITMAP_TYPE_BMP),
-                   shortHelpString="Toggle with 2 bitmaps", toggle=true)
+        tb.AddCheckTool(60, '', images.getTog1Bitmap(), images.getTog2Bitmap())

         EVT_TOOL(self, 60, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)
         tb.Realize()
         EVT_TOOL(self, 60, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)
         tb.Realize()


@@ -66,8 +64,6 @@ class TestFloatBar(wxFrame):
 
     def OnToolRClick(self, event):
         self.log.WriteText("tool %s right-clicked\n" % event.GetId())
 
     def OnToolRClick(self, event):
         self.log.WriteText("tool %s right-clicked\n" % event.GetId())

- #   def test(self, event):
- #       self.log.WriteText("Button clicked!")

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------