only return matching modes from GetModes()

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

diff --git a/wxPython/demo/ToolBar.py b/wxPython/demo/ToolBar.py
index 2a4675cff38163e6de9d35671dd1c6017eefce2d..69e438d2d5ee39d1062bfe5f9d51b2054cd99c3b 100644 (file)
--- a/wxPython/demo/ToolBar.py
+++ b/wxPython/demo/ToolBar.py
@@ -18,7 +18,7 @@ class TestToolBar(wx.Frame):
         tb = self.CreateToolBar( wx.TB_HORIZONTAL
                                  | wx.NO_BORDER
                                  | wx.TB_FLAT
-                                 | wx.TB_TEXT
+                                 #| wx.TB_TEXT
                                  )
 
         # Here's a 'simple' toolbar example, and how to bind it using SetToolBar()
@@ -32,10 +32,12 @@ class TestToolBar(wx.Frame):
         self.CreateStatusBar()
 
         tsize = (16,16)
-        new_bmp =  wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR, tsize)
+        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.SetToolBitmapSize(tsize)
         
         tb.AddSimpleTool(10, new_bmp, "New", "Long help for 'New'")
         #tb.AddLabelTool(10, "New", new_bmp, shortHelp="New", longHelp="Long help for 'New'")