removed WXWIN_COMPATIBILITY_2_4 from common and wxMSW files (patch 1675546)

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

diff --git a/wxPython/demo/ArtProvider.py b/wxPython/demo/ArtProvider.py
index 91d7a9fafc843a7cc1dfb2e2cc612a3ddae09be9..00cc9068ff96501160d12228e63fa8636c91635c 100644 (file)
--- a/wxPython/demo/ArtProvider.py
+++ b/wxPython/demo/ArtProvider.py
@@ -55,6 +55,7 @@ ArtIDs = [ "wx.ART_ADD_BOOKMARK",
            "wx.ART_CUT",
            "wx.ART_PASTE",
            "wx.ART_DELETE",
+           "wx.ART_NEW",
            "wx.ART_UNDO",
            "wx.ART_REDO",
            "wx.ART_QUIT",
@@ -196,17 +197,17 @@ class TestPanel(wx.Panel):
     def OnUseCustom(self, evt):
         if evt.IsChecked():
             self.log.write("Images will now be provided by MyArtProvider\n")
-            wx.ArtProvider_PushProvider( MyArtProvider(self.log) )
+            wx.ArtProvider.Push( MyArtProvider(self.log) )
         else:
             self.log.write("MyArtProvider deactivated\n")
-            wx.ArtProvider_PopProvider()
+            wx.ArtProvider.Pop()
         self.getArt()
 
 
     def getArt(self):
         self.log.write("Getting art for %s:%s\n" % (self.client, self.artid))
 
-        bmp = wx.ArtProvider_GetBitmap(self.artid, self.client, (16,16))
+        bmp = wx.ArtProvider.GetBitmap(self.artid, self.client, (16,16))
 
         if not bmp.Ok():
             bmp = wx.EmptyBitmap(16,16)
@@ -214,7 +215,7 @@ class TestPanel(wx.Panel):
 
         self.bmp16.SetBitmap(bmp)
 
-        bmp = wx.ArtProvider_GetBitmap(self.artid, self.client, (32,32))
+        bmp = wx.ArtProvider.GetBitmap(self.artid, self.client, (32,32))
 
         if not bmp.Ok():
             bmp = wx.EmptyBitmap(32,32)
@@ -222,7 +223,7 @@ class TestPanel(wx.Panel):
 
         self.bmp32.SetBitmap(bmp)
 
-        bmp = wx.ArtProvider_GetBitmap(self.artid, self.client, (48,48))
+        bmp = wx.ArtProvider.GetBitmap(self.artid, self.client, (48,48))
 
         if not bmp.Ok():
             bmp = wx.EmptyBitmap(48,48)
@@ -258,11 +259,11 @@ the users can plug in their own wx.ArtProvider class and easily replace
 standard art with his/her own version. It is easy thing to do: all
 that is needed is to derive a class from wx.ArtProvider, override it's
 CreateBitmap method and register the provider with
-wx.ArtProvider_PushProvider.
+wx.ArtProvider.PushProvider.
 <p>
 
 This class can also be used to get the platform native icons as
-provided by wx.ArtProvider_GetBitmap or wx.ArtProvider_GetIcon methods.
+provided by wx.ArtProvider.GetBitmap or wx.ArtProvider.GetIcon methods.
 
 </body></html>
 """