X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8eca4fef106b8327e2e55636de3f68a511a4c392..628eae0bcd7916c57847b7eab739d4cc32534ccf:/wxPython/demo/FloatBar.py?ds=sidebyside

diff --git a/wxPython/demo/FloatBar.py b/wxPython/demo/FloatBar.py
index 8be8583649..43de54fdd8 100644
--- a/wxPython/demo/FloatBar.py
+++ b/wxPython/demo/FloatBar.py
@@ -32,20 +32,26 @@ class TestFloatBar(wx.Frame):
         tb.SetTitle("Floating!")
         self.CreateStatusBar()
 
-        tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
+        tsize = (16,16)
+        new_bmp =  wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR, tsize)
+        open_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, tsize)
+        copy_bmp = wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, tsize)
+        paste_bmp= wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR, tsize)
+
+        tb.AddSimpleTool(10, new_bmp, "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")
+        tb.AddSimpleTool(20, open_bmp, "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")
+        tb.AddSimpleTool(30, copy_bmp, "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")
+        tb.AddSimpleTool(40, paste_bmp, "Paste")
         self.Bind(wx.EVT_TOOL, self.OnToolClick, id=40)
         self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=40)
 
@@ -80,18 +86,34 @@ class TestFloatBar(wx.Frame):
 
 #---------------------------------------------------------------------------
 
+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        wx.Panel.__init__(self, parent, -1)
+
+        b = wx.Button(self, -1, "Show the FloatBar sample", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        if wx.Platform == "__WXMAC__":
+            dlg = wx.MessageDialog(
+                    self, 'FloatBar does not work well on this platform.',
+                    'Sorry', wx.OK | wx.ICON_WARNING
+                    )
+            dlg.ShowModal()
+            dlg.Destroy()
+        else:
+            win = TestFloatBar(self, self.log)
+            win.Show(True)
+
+
+#---------------------------------------------------------------------------
+
+
 def runTest(frame, nb, log):
-    if wx.Platform == "__WXMAC__":
-        dlg = wx.MessageDialog(
-                frame, 'FloatBar does not work well on this platform.',
-                'Sorry', wx.OK | wx.ICON_INFORMATION
-                )
-        dlg.ShowModal()
-        dlg.Destroy()
-    else:
-        win = TestFloatBar(frame, log)
-        frame.otherWin = win
-        win.Show(True)
+    win = TestPanel(nb, log)
+    return win
 
 #---------------------------------------------------------------------------