Fixes for using the staticmethods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/demo/ArtProvider.py b/wxPython/demo/ArtProvider.py
index 336dbbee8658644788615595ead801b77124e903..00cc9068ff96501160d12228e63fa8636c91635c 100644 (file)
--- a/wxPython/demo/ArtProvider.py
+++ b/wxPython/demo/ArtProvider.py
@@ -197,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)
@@ -215,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)
@@ -223,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)

diff --git a/wxPython/src/_artprov.i b/wxPython/src/_artprov.i
index 8e10f6e9fd7fb3c480b422eae0e5ffd5db1155bd..e0acf440158b335c90fc4177ffd21cdd9e104a3b 100644 (file)
--- a/wxPython/src/_artprov.i
+++ b/wxPython/src/_artprov.i
@@ -254,12 +254,12 @@ public:
     DocDeclStr(
         static void , Push(wxPyArtProvider *provider),
         "Add new provider to the top of providers stack.", "");
-    %pythoncode { PushProvider = wx._deprecated(Push, "See `Push`") }
+    %pythoncode { PushProvider = Push }
     
     DocDeclStr(
         static void , Insert(wxPyArtProvider *provider),
         "Add new provider to the bottom of providers stack.", "");
-    %pythoncode { InsertProvider = wx._deprecated(Insert, "See `Insert`") }
+    %pythoncode { InsertProvider = Insert }
 
     %cleardisown( wxPyArtProvider *provider );
     
@@ -267,14 +267,14 @@ public:
     DocDeclStr(
         static bool , Pop(),
         "Remove latest added provider and delete it.", "");
-    %pythoncode { PopProvider = wx._deprecated(Pop, "See `Pop`") }
+    %pythoncode { PopProvider = Pop }
     
     %pythonAppend Delete "args[1].thisown = 1";
     DocDeclStr(
         static bool , Delete(wxPyArtProvider *provider),
         "Remove provider. The provider must have been added previously!  The
 provider is _not_ deleted.", "");
-    %pythoncode { RemoveProvider = wx._deprecated(Delete, "See `Delete`") }
+    %pythoncode { RemoveProvider = Delete }
 
 
     DocDeclStr(

diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index 75db32bf1e0b24da0cfe76af3d8cf206e64d3e63..1c03a4609b938be7d4fa55a98e16d1c7c31c4240 100644 (file)
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -2660,7 +2660,7 @@ class ArtProvider(object):
         return _misc_.ArtProvider_Push(*args, **kwargs)
 
     Push = staticmethod(Push)
-    PushProvider = wx._deprecated(Push, "See `Push`") 
+    PushProvider = Push 
     def Insert(*args, **kwargs):
         """
         Insert(ArtProvider provider)
@@ -2670,7 +2670,7 @@ class ArtProvider(object):
         return _misc_.ArtProvider_Insert(*args, **kwargs)
 
     Insert = staticmethod(Insert)
-    InsertProvider = wx._deprecated(Insert, "See `Insert`") 
+    InsertProvider = Insert 
     def Pop(*args, **kwargs):
         """
         Pop() -> bool
@@ -2680,7 +2680,7 @@ class ArtProvider(object):
         return _misc_.ArtProvider_Pop(*args, **kwargs)
 
     Pop = staticmethod(Pop)
-    PopProvider = wx._deprecated(Pop, "See `Pop`") 
+    PopProvider = Pop 
     def Delete(*args, **kwargs):
         """
         Delete(ArtProvider provider) -> bool
@@ -2693,7 +2693,7 @@ class ArtProvider(object):
         return val
 
     Delete = staticmethod(Delete)
-    RemoveProvider = wx._deprecated(Delete, "See `Delete`") 
+    RemoveProvider = Delete 
     def GetBitmap(*args, **kwargs):
         """
         GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap

diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index 2378a5c9481aa855f1b839ce04dc2f19e9298727..a40b2584a28fd49bc2df1866ca2a677bdd89a43b 100644 (file)
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -2660,7 +2660,7 @@ class ArtProvider(object):
         return _misc_.ArtProvider_Push(*args, **kwargs)
 
     Push = staticmethod(Push)
-    PushProvider = wx._deprecated(Push, "See `Push`") 
+    PushProvider = Push 
     def Insert(*args, **kwargs):
         """
         Insert(ArtProvider provider)
@@ -2670,7 +2670,7 @@ class ArtProvider(object):
         return _misc_.ArtProvider_Insert(*args, **kwargs)
 
     Insert = staticmethod(Insert)
-    InsertProvider = wx._deprecated(Insert, "See `Insert`") 
+    InsertProvider = Insert 
     def Pop(*args, **kwargs):
         """
         Pop() -> bool
@@ -2680,7 +2680,7 @@ class ArtProvider(object):
         return _misc_.ArtProvider_Pop(*args, **kwargs)
 
     Pop = staticmethod(Pop)
-    PopProvider = wx._deprecated(Pop, "See `Pop`") 
+    PopProvider = Pop 
     def Delete(*args, **kwargs):
         """
         Delete(ArtProvider provider) -> bool
@@ -2693,7 +2693,7 @@ class ArtProvider(object):
         return val
 
     Delete = staticmethod(Delete)
-    RemoveProvider = wx._deprecated(Delete, "See `Delete`") 
+    RemoveProvider = Delete 
     def GetBitmap(*args, **kwargs):
         """
         GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap

diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py
index 2378a5c9481aa855f1b839ce04dc2f19e9298727..a40b2584a28fd49bc2df1866ca2a677bdd89a43b 100644 (file)
--- a/wxPython/src/msw/_misc.py
+++ b/wxPython/src/msw/_misc.py
@@ -2660,7 +2660,7 @@ class ArtProvider(object):
         return _misc_.ArtProvider_Push(*args, **kwargs)
 
     Push = staticmethod(Push)
-    PushProvider = wx._deprecated(Push, "See `Push`") 
+    PushProvider = Push 
     def Insert(*args, **kwargs):
         """
         Insert(ArtProvider provider)
@@ -2670,7 +2670,7 @@ class ArtProvider(object):
         return _misc_.ArtProvider_Insert(*args, **kwargs)
 
     Insert = staticmethod(Insert)
-    InsertProvider = wx._deprecated(Insert, "See `Insert`") 
+    InsertProvider = Insert 
     def Pop(*args, **kwargs):
         """
         Pop() -> bool
@@ -2680,7 +2680,7 @@ class ArtProvider(object):
         return _misc_.ArtProvider_Pop(*args, **kwargs)
 
     Pop = staticmethod(Pop)
-    PopProvider = wx._deprecated(Pop, "See `Pop`") 
+    PopProvider = Pop 
     def Delete(*args, **kwargs):
         """
         Delete(ArtProvider provider) -> bool
@@ -2693,7 +2693,7 @@ class ArtProvider(object):
         return val
 
     Delete = staticmethod(Delete)
-    RemoveProvider = wx._deprecated(Delete, "See `Delete`") 
+    RemoveProvider = Delete 
     def GetBitmap(*args, **kwargs):
         """
         GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap