X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34a544a635f3bac9320e6eb41aaaa5a5e8d1f5a4..f18eaf2687ab42c97ccf469a2617306cadc0c6ef:/wxPython/demo/FloatBar.py?ds=sidebyside

diff --git a/wxPython/demo/FloatBar.py b/wxPython/demo/FloatBar.py
index 1b7d7c9193..48f683e536 100644
--- a/wxPython/demo/FloatBar.py
+++ b/wxPython/demo/FloatBar.py
@@ -2,7 +2,7 @@
 # Please note that wx.lib.floatbar is not formally supported as
 # part of wxPython. If it works, fine. If not, unfortunate.
 # GTK users can use the wx.TB_DOCKABLE flag with a regular
-# wx.ToolBar, but everyone else has to take thier chances.
+# wx.ToolBar, but everyone else has to take their chances.
 #
 
 import  wx
@@ -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_NEW, 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)
 
@@ -93,7 +99,7 @@ class TestPanel(wx.Panel):
         if wx.Platform == "__WXMAC__":
             dlg = wx.MessageDialog(
                     self, 'FloatBar does not work well on this platform.',
-                    'Sorry', wx.OK | wx.ICON_INFORMATION
+                    'Sorry', wx.OK | wx.ICON_WARNING
                     )
             dlg.ShowModal()
             dlg.Destroy()