From 4391d97b25fd40caf3723a79db8843a6bfc3fa17 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sat, 23 Sep 2006 23:26:08 +0000
Subject: [PATCH] New names for some ArtProvider methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
wxPython/src/_artprov.i | 24 ++++++++-----
wxPython/src/gtk/_misc.py | 64 +++++++++++++++++----------------
wxPython/src/gtk/_misc_wrap.cpp | 38 ++++++++++----------
wxPython/src/mac/_misc.py | 64 +++++++++++++++++----------------
wxPython/src/mac/_misc_wrap.cpp | 38 ++++++++++----------
wxPython/src/msw/_misc.py | 64 +++++++++++++++++----------------
wxPython/src/msw/_misc_wrap.cpp | 38 ++++++++++----------
7 files changed, 174 insertions(+), 156 deletions(-)
diff --git a/wxPython/src/_artprov.i b/wxPython/src/_artprov.i
index 6a214f5363..8e10f6e9fd 100644
--- a/wxPython/src/_artprov.i
+++ b/wxPython/src/_artprov.i
@@ -131,7 +131,7 @@ asks wx.ArtProvider for it instead. This way 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::
+method and register the provider with `wx.ArtProvider.Push`::
class MyArtProvider(wx.ArtProvider):
def __init__(self):
@@ -148,7 +148,7 @@ Identifying art resources
Every bitmap is known to wx.ArtProvider under an unique ID that is
used when requesting a resource from it. The IDs can have one of the
following predefined values. Additionally, any string recognized by
-custom art providers registered using `PushProvider` may be used.
+custom art providers registered using `Push` may be used.
GTK+ Note
---------
@@ -250,26 +250,32 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%disownarg( wxPyArtProvider *provider );
+
DocDeclStr(
- static void , PushProvider(wxPyArtProvider *provider),
+ static void , Push(wxPyArtProvider *provider),
"Add new provider to the top of providers stack.", "");
-
+ %pythoncode { PushProvider = wx._deprecated(Push, "See `Push`") }
+
DocDeclStr(
- static void , InsertProvider(wxPyArtProvider *provider),
+ static void , Insert(wxPyArtProvider *provider),
"Add new provider to the bottom of providers stack.", "");
+ %pythoncode { InsertProvider = wx._deprecated(Insert, "See `Insert`") }
+
%cleardisown( wxPyArtProvider *provider );
DocDeclStr(
- static bool , PopProvider(),
+ static bool , Pop(),
"Remove latest added provider and delete it.", "");
+ %pythoncode { PopProvider = wx._deprecated(Pop, "See `Pop`") }
- %pythonAppend RemoveProvider "args[1].thisown = 1";
+ %pythonAppend Delete "args[1].thisown = 1";
DocDeclStr(
- static bool , RemoveProvider(wxPyArtProvider *provider),
+ 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`") }
+
DocDeclStr(
static wxBitmap , GetBitmap(const wxString& id,
diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index dc8163d473..d8a997ccfc 100644
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -2607,7 +2607,7 @@ class ArtProvider(object):
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::
+ method and register the provider with `wx.ArtProvider.Push`::
class MyArtProvider(wx.ArtProvider):
def __init__(self):
@@ -2631,7 +2631,7 @@ class ArtProvider(object):
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::
+ method and register the provider with `wx.ArtProvider.Push`::
class MyArtProvider(wx.ArtProvider):
def __init__(self):
@@ -2651,45 +2651,49 @@ class ArtProvider(object):
"""_setCallbackInfo(self, PyObject self, PyObject _class)"""
return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs)
- def PushProvider(*args, **kwargs):
+ def Push(*args, **kwargs):
"""
- PushProvider(ArtProvider provider)
+ Push(ArtProvider provider)
Add new provider to the top of providers stack.
"""
- return _misc_.ArtProvider_PushProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Push(*args, **kwargs)
- PushProvider = staticmethod(PushProvider)
- def InsertProvider(*args, **kwargs):
+ Push = staticmethod(Push)
+ PushProvider = wx._deprecated(Push, "See `Push`")
+ def Insert(*args, **kwargs):
"""
- InsertProvider(ArtProvider provider)
+ Insert(ArtProvider provider)
Add new provider to the bottom of providers stack.
"""
- return _misc_.ArtProvider_InsertProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Insert(*args, **kwargs)
- InsertProvider = staticmethod(InsertProvider)
- def PopProvider(*args, **kwargs):
+ Insert = staticmethod(Insert)
+ InsertProvider = wx._deprecated(Insert, "See `Insert`")
+ def Pop(*args, **kwargs):
"""
- PopProvider() -> bool
+ Pop() -> bool
Remove latest added provider and delete it.
"""
- return _misc_.ArtProvider_PopProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Pop(*args, **kwargs)
- PopProvider = staticmethod(PopProvider)
- def RemoveProvider(*args, **kwargs):
+ Pop = staticmethod(Pop)
+ PopProvider = wx._deprecated(Pop, "See `Pop`")
+ def Delete(*args, **kwargs):
"""
- RemoveProvider(ArtProvider provider) -> bool
+ Delete(ArtProvider provider) -> bool
Remove provider. The provider must have been added previously! The
provider is _not_ deleted.
"""
- val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+ val = _misc_.ArtProvider_Delete(*args, **kwargs)
args[1].thisown = 1
return val
- RemoveProvider = staticmethod(RemoveProvider)
+ Delete = staticmethod(Delete)
+ RemoveProvider = wx._deprecated(Delete, "See `Delete`")
def GetBitmap(*args, **kwargs):
"""
GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap
@@ -2784,38 +2788,38 @@ ART_QUIT = cvar.ART_QUIT
ART_FIND = cvar.ART_FIND
ART_FIND_AND_REPLACE = cvar.ART_FIND_AND_REPLACE
-def ArtProvider_PushProvider(*args, **kwargs):
+def ArtProvider_Push(*args, **kwargs):
"""
- ArtProvider_PushProvider(ArtProvider provider)
+ ArtProvider_Push(ArtProvider provider)
Add new provider to the top of providers stack.
"""
- return _misc_.ArtProvider_PushProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Push(*args, **kwargs)
-def ArtProvider_InsertProvider(*args, **kwargs):
+def ArtProvider_Insert(*args, **kwargs):
"""
- ArtProvider_InsertProvider(ArtProvider provider)
+ ArtProvider_Insert(ArtProvider provider)
Add new provider to the bottom of providers stack.
"""
- return _misc_.ArtProvider_InsertProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Insert(*args, **kwargs)
-def ArtProvider_PopProvider(*args):
+def ArtProvider_Pop(*args):
"""
- ArtProvider_PopProvider() -> bool
+ ArtProvider_Pop() -> bool
Remove latest added provider and delete it.
"""
- return _misc_.ArtProvider_PopProvider(*args)
+ return _misc_.ArtProvider_Pop(*args)
-def ArtProvider_RemoveProvider(*args, **kwargs):
+def ArtProvider_Delete(*args, **kwargs):
"""
- ArtProvider_RemoveProvider(ArtProvider provider) -> bool
+ ArtProvider_Delete(ArtProvider provider) -> bool
Remove provider. The provider must have been added previously! The
provider is _not_ deleted.
"""
- val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+ val = _misc_.ArtProvider_Delete(*args, **kwargs)
args[1].thisown = 1
return val
diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp
index 7470b75a37..0b3b8211ee 100644
--- a/wxPython/src/gtk/_misc_wrap.cpp
+++ b/wxPython/src/gtk/_misc_wrap.cpp
@@ -20436,7 +20436,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_PushProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Push(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
int res1 = 0 ;
@@ -20445,14 +20445,14 @@ SWIGINTERN PyObject *_wrap_ArtProvider_PushProvider(PyObject *SWIGUNUSEDPARM(sel
(char *) "provider", NULL
};
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_PushProvider",kwnames,&obj0)) SWIG_fail;
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_Push",kwnames,&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, SWIG_as_voidptrptr(&arg1), SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_PushProvider" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_Push" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- wxPyArtProvider::PushProvider(arg1);
+ wxPyArtProvider::Push(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -20463,7 +20463,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_InsertProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
int res1 = 0 ;
@@ -20472,14 +20472,14 @@ SWIGINTERN PyObject *_wrap_ArtProvider_InsertProvider(PyObject *SWIGUNUSEDPARM(s
(char *) "provider", NULL
};
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_InsertProvider",kwnames,&obj0)) SWIG_fail;
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_Insert",kwnames,&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, SWIG_as_voidptrptr(&arg1), SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_InsertProvider" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_Insert" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- wxPyArtProvider::InsertProvider(arg1);
+ wxPyArtProvider::Insert(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -20490,14 +20490,14 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_PopProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
bool result;
- if (!SWIG_Python_UnpackTuple(args,"ArtProvider_PopProvider",0,0,0)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args,"ArtProvider_Pop",0,0,0)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)wxPyArtProvider::PopProvider();
+ result = (bool)wxPyArtProvider::Pop();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -20510,7 +20510,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Delete(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
bool result;
@@ -20521,15 +20521,15 @@ SWIGINTERN PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *SWIGUNUSEDPARM(s
(char *) "provider", NULL
};
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_RemoveProvider",kwnames,&obj0)) SWIG_fail;
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_Delete",kwnames,&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyArtProvider, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_RemoveProvider" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_Delete" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
}
arg1 = reinterpret_cast< wxPyArtProvider * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)wxPyArtProvider::RemoveProvider(arg1);
+ result = (bool)wxPyArtProvider::Delete(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -37826,10 +37826,10 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"new_ArtProvider", (PyCFunction)_wrap_new_ArtProvider, METH_NOARGS, NULL},
{ (char *)"delete_ArtProvider", (PyCFunction)_wrap_delete_ArtProvider, METH_O, NULL},
{ (char *)"ArtProvider__setCallbackInfo", (PyCFunction) _wrap_ArtProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
- { (char *)"ArtProvider_PushProvider", (PyCFunction) _wrap_ArtProvider_PushProvider, METH_VARARGS | METH_KEYWORDS, NULL},
- { (char *)"ArtProvider_InsertProvider", (PyCFunction) _wrap_ArtProvider_InsertProvider, METH_VARARGS | METH_KEYWORDS, NULL},
- { (char *)"ArtProvider_PopProvider", (PyCFunction)_wrap_ArtProvider_PopProvider, METH_NOARGS, NULL},
- { (char *)"ArtProvider_RemoveProvider", (PyCFunction) _wrap_ArtProvider_RemoveProvider, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ArtProvider_Push", (PyCFunction) _wrap_ArtProvider_Push, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ArtProvider_Insert", (PyCFunction) _wrap_ArtProvider_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ArtProvider_Pop", (PyCFunction)_wrap_ArtProvider_Pop, METH_NOARGS, NULL},
+ { (char *)"ArtProvider_Delete", (PyCFunction) _wrap_ArtProvider_Delete, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ArtProvider_GetBitmap", (PyCFunction) _wrap_ArtProvider_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ArtProvider_GetIcon", (PyCFunction) _wrap_ArtProvider_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ArtProvider_GetSizeHint", (PyCFunction) _wrap_ArtProvider_GetSizeHint, METH_VARARGS | METH_KEYWORDS, NULL},
diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index b09996d6db..70f0067393 100644
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -2607,7 +2607,7 @@ class ArtProvider(object):
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::
+ method and register the provider with `wx.ArtProvider.Push`::
class MyArtProvider(wx.ArtProvider):
def __init__(self):
@@ -2631,7 +2631,7 @@ class ArtProvider(object):
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::
+ method and register the provider with `wx.ArtProvider.Push`::
class MyArtProvider(wx.ArtProvider):
def __init__(self):
@@ -2651,45 +2651,49 @@ class ArtProvider(object):
"""_setCallbackInfo(self, PyObject self, PyObject _class)"""
return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs)
- def PushProvider(*args, **kwargs):
+ def Push(*args, **kwargs):
"""
- PushProvider(ArtProvider provider)
+ Push(ArtProvider provider)
Add new provider to the top of providers stack.
"""
- return _misc_.ArtProvider_PushProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Push(*args, **kwargs)
- PushProvider = staticmethod(PushProvider)
- def InsertProvider(*args, **kwargs):
+ Push = staticmethod(Push)
+ PushProvider = wx._deprecated(Push, "See `Push`")
+ def Insert(*args, **kwargs):
"""
- InsertProvider(ArtProvider provider)
+ Insert(ArtProvider provider)
Add new provider to the bottom of providers stack.
"""
- return _misc_.ArtProvider_InsertProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Insert(*args, **kwargs)
- InsertProvider = staticmethod(InsertProvider)
- def PopProvider(*args, **kwargs):
+ Insert = staticmethod(Insert)
+ InsertProvider = wx._deprecated(Insert, "See `Insert`")
+ def Pop(*args, **kwargs):
"""
- PopProvider() -> bool
+ Pop() -> bool
Remove latest added provider and delete it.
"""
- return _misc_.ArtProvider_PopProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Pop(*args, **kwargs)
- PopProvider = staticmethod(PopProvider)
- def RemoveProvider(*args, **kwargs):
+ Pop = staticmethod(Pop)
+ PopProvider = wx._deprecated(Pop, "See `Pop`")
+ def Delete(*args, **kwargs):
"""
- RemoveProvider(ArtProvider provider) -> bool
+ Delete(ArtProvider provider) -> bool
Remove provider. The provider must have been added previously! The
provider is _not_ deleted.
"""
- val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+ val = _misc_.ArtProvider_Delete(*args, **kwargs)
args[1].thisown = 1
return val
- RemoveProvider = staticmethod(RemoveProvider)
+ Delete = staticmethod(Delete)
+ RemoveProvider = wx._deprecated(Delete, "See `Delete`")
def GetBitmap(*args, **kwargs):
"""
GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap
@@ -2784,38 +2788,38 @@ ART_QUIT = cvar.ART_QUIT
ART_FIND = cvar.ART_FIND
ART_FIND_AND_REPLACE = cvar.ART_FIND_AND_REPLACE
-def ArtProvider_PushProvider(*args, **kwargs):
+def ArtProvider_Push(*args, **kwargs):
"""
- ArtProvider_PushProvider(ArtProvider provider)
+ ArtProvider_Push(ArtProvider provider)
Add new provider to the top of providers stack.
"""
- return _misc_.ArtProvider_PushProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Push(*args, **kwargs)
-def ArtProvider_InsertProvider(*args, **kwargs):
+def ArtProvider_Insert(*args, **kwargs):
"""
- ArtProvider_InsertProvider(ArtProvider provider)
+ ArtProvider_Insert(ArtProvider provider)
Add new provider to the bottom of providers stack.
"""
- return _misc_.ArtProvider_InsertProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Insert(*args, **kwargs)
-def ArtProvider_PopProvider(*args):
+def ArtProvider_Pop(*args):
"""
- ArtProvider_PopProvider() -> bool
+ ArtProvider_Pop() -> bool
Remove latest added provider and delete it.
"""
- return _misc_.ArtProvider_PopProvider(*args)
+ return _misc_.ArtProvider_Pop(*args)
-def ArtProvider_RemoveProvider(*args, **kwargs):
+def ArtProvider_Delete(*args, **kwargs):
"""
- ArtProvider_RemoveProvider(ArtProvider provider) -> bool
+ ArtProvider_Delete(ArtProvider provider) -> bool
Remove provider. The provider must have been added previously! The
provider is _not_ deleted.
"""
- val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+ val = _misc_.ArtProvider_Delete(*args, **kwargs)
args[1].thisown = 1
return val
diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp
index 5f662e24cd..9c738e4c14 100644
--- a/wxPython/src/mac/_misc_wrap.cpp
+++ b/wxPython/src/mac/_misc_wrap.cpp
@@ -20428,7 +20428,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_PushProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Push(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
int res1 = 0 ;
@@ -20437,14 +20437,14 @@ SWIGINTERN PyObject *_wrap_ArtProvider_PushProvider(PyObject *SWIGUNUSEDPARM(sel
(char *) "provider", NULL
};
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_PushProvider",kwnames,&obj0)) SWIG_fail;
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_Push",kwnames,&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, SWIG_as_voidptrptr(&arg1), SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_PushProvider" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_Push" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- wxPyArtProvider::PushProvider(arg1);
+ wxPyArtProvider::Push(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -20455,7 +20455,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_InsertProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
int res1 = 0 ;
@@ -20464,14 +20464,14 @@ SWIGINTERN PyObject *_wrap_ArtProvider_InsertProvider(PyObject *SWIGUNUSEDPARM(s
(char *) "provider", NULL
};
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_InsertProvider",kwnames,&obj0)) SWIG_fail;
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_Insert",kwnames,&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, SWIG_as_voidptrptr(&arg1), SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_InsertProvider" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_Insert" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- wxPyArtProvider::InsertProvider(arg1);
+ wxPyArtProvider::Insert(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -20482,14 +20482,14 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_PopProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
bool result;
- if (!SWIG_Python_UnpackTuple(args,"ArtProvider_PopProvider",0,0,0)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args,"ArtProvider_Pop",0,0,0)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)wxPyArtProvider::PopProvider();
+ result = (bool)wxPyArtProvider::Pop();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -20502,7 +20502,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Delete(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
bool result;
@@ -20513,15 +20513,15 @@ SWIGINTERN PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *SWIGUNUSEDPARM(s
(char *) "provider", NULL
};
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_RemoveProvider",kwnames,&obj0)) SWIG_fail;
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_Delete",kwnames,&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyArtProvider, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_RemoveProvider" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_Delete" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
}
arg1 = reinterpret_cast< wxPyArtProvider * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)wxPyArtProvider::RemoveProvider(arg1);
+ result = (bool)wxPyArtProvider::Delete(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -37887,10 +37887,10 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"new_ArtProvider", (PyCFunction)_wrap_new_ArtProvider, METH_NOARGS, NULL},
{ (char *)"delete_ArtProvider", (PyCFunction)_wrap_delete_ArtProvider, METH_O, NULL},
{ (char *)"ArtProvider__setCallbackInfo", (PyCFunction) _wrap_ArtProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
- { (char *)"ArtProvider_PushProvider", (PyCFunction) _wrap_ArtProvider_PushProvider, METH_VARARGS | METH_KEYWORDS, NULL},
- { (char *)"ArtProvider_InsertProvider", (PyCFunction) _wrap_ArtProvider_InsertProvider, METH_VARARGS | METH_KEYWORDS, NULL},
- { (char *)"ArtProvider_PopProvider", (PyCFunction)_wrap_ArtProvider_PopProvider, METH_NOARGS, NULL},
- { (char *)"ArtProvider_RemoveProvider", (PyCFunction) _wrap_ArtProvider_RemoveProvider, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ArtProvider_Push", (PyCFunction) _wrap_ArtProvider_Push, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ArtProvider_Insert", (PyCFunction) _wrap_ArtProvider_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ArtProvider_Pop", (PyCFunction)_wrap_ArtProvider_Pop, METH_NOARGS, NULL},
+ { (char *)"ArtProvider_Delete", (PyCFunction) _wrap_ArtProvider_Delete, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ArtProvider_GetBitmap", (PyCFunction) _wrap_ArtProvider_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ArtProvider_GetIcon", (PyCFunction) _wrap_ArtProvider_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ArtProvider_GetSizeHint", (PyCFunction) _wrap_ArtProvider_GetSizeHint, METH_VARARGS | METH_KEYWORDS, NULL},
diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py
index b09996d6db..70f0067393 100644
--- a/wxPython/src/msw/_misc.py
+++ b/wxPython/src/msw/_misc.py
@@ -2607,7 +2607,7 @@ class ArtProvider(object):
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::
+ method and register the provider with `wx.ArtProvider.Push`::
class MyArtProvider(wx.ArtProvider):
def __init__(self):
@@ -2631,7 +2631,7 @@ class ArtProvider(object):
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::
+ method and register the provider with `wx.ArtProvider.Push`::
class MyArtProvider(wx.ArtProvider):
def __init__(self):
@@ -2651,45 +2651,49 @@ class ArtProvider(object):
"""_setCallbackInfo(self, PyObject self, PyObject _class)"""
return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs)
- def PushProvider(*args, **kwargs):
+ def Push(*args, **kwargs):
"""
- PushProvider(ArtProvider provider)
+ Push(ArtProvider provider)
Add new provider to the top of providers stack.
"""
- return _misc_.ArtProvider_PushProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Push(*args, **kwargs)
- PushProvider = staticmethod(PushProvider)
- def InsertProvider(*args, **kwargs):
+ Push = staticmethod(Push)
+ PushProvider = wx._deprecated(Push, "See `Push`")
+ def Insert(*args, **kwargs):
"""
- InsertProvider(ArtProvider provider)
+ Insert(ArtProvider provider)
Add new provider to the bottom of providers stack.
"""
- return _misc_.ArtProvider_InsertProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Insert(*args, **kwargs)
- InsertProvider = staticmethod(InsertProvider)
- def PopProvider(*args, **kwargs):
+ Insert = staticmethod(Insert)
+ InsertProvider = wx._deprecated(Insert, "See `Insert`")
+ def Pop(*args, **kwargs):
"""
- PopProvider() -> bool
+ Pop() -> bool
Remove latest added provider and delete it.
"""
- return _misc_.ArtProvider_PopProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Pop(*args, **kwargs)
- PopProvider = staticmethod(PopProvider)
- def RemoveProvider(*args, **kwargs):
+ Pop = staticmethod(Pop)
+ PopProvider = wx._deprecated(Pop, "See `Pop`")
+ def Delete(*args, **kwargs):
"""
- RemoveProvider(ArtProvider provider) -> bool
+ Delete(ArtProvider provider) -> bool
Remove provider. The provider must have been added previously! The
provider is _not_ deleted.
"""
- val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+ val = _misc_.ArtProvider_Delete(*args, **kwargs)
args[1].thisown = 1
return val
- RemoveProvider = staticmethod(RemoveProvider)
+ Delete = staticmethod(Delete)
+ RemoveProvider = wx._deprecated(Delete, "See `Delete`")
def GetBitmap(*args, **kwargs):
"""
GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap
@@ -2784,38 +2788,38 @@ ART_QUIT = cvar.ART_QUIT
ART_FIND = cvar.ART_FIND
ART_FIND_AND_REPLACE = cvar.ART_FIND_AND_REPLACE
-def ArtProvider_PushProvider(*args, **kwargs):
+def ArtProvider_Push(*args, **kwargs):
"""
- ArtProvider_PushProvider(ArtProvider provider)
+ ArtProvider_Push(ArtProvider provider)
Add new provider to the top of providers stack.
"""
- return _misc_.ArtProvider_PushProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Push(*args, **kwargs)
-def ArtProvider_InsertProvider(*args, **kwargs):
+def ArtProvider_Insert(*args, **kwargs):
"""
- ArtProvider_InsertProvider(ArtProvider provider)
+ ArtProvider_Insert(ArtProvider provider)
Add new provider to the bottom of providers stack.
"""
- return _misc_.ArtProvider_InsertProvider(*args, **kwargs)
+ return _misc_.ArtProvider_Insert(*args, **kwargs)
-def ArtProvider_PopProvider(*args):
+def ArtProvider_Pop(*args):
"""
- ArtProvider_PopProvider() -> bool
+ ArtProvider_Pop() -> bool
Remove latest added provider and delete it.
"""
- return _misc_.ArtProvider_PopProvider(*args)
+ return _misc_.ArtProvider_Pop(*args)
-def ArtProvider_RemoveProvider(*args, **kwargs):
+def ArtProvider_Delete(*args, **kwargs):
"""
- ArtProvider_RemoveProvider(ArtProvider provider) -> bool
+ ArtProvider_Delete(ArtProvider provider) -> bool
Remove provider. The provider must have been added previously! The
provider is _not_ deleted.
"""
- val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+ val = _misc_.ArtProvider_Delete(*args, **kwargs)
args[1].thisown = 1
return val
diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp
index a867ef2e30..7240c47001 100644
--- a/wxPython/src/msw/_misc_wrap.cpp
+++ b/wxPython/src/msw/_misc_wrap.cpp
@@ -20428,7 +20428,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_PushProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Push(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
int res1 = 0 ;
@@ -20437,14 +20437,14 @@ SWIGINTERN PyObject *_wrap_ArtProvider_PushProvider(PyObject *SWIGUNUSEDPARM(sel
(char *) "provider", NULL
};
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_PushProvider",kwnames,&obj0)) SWIG_fail;
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_Push",kwnames,&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, SWIG_as_voidptrptr(&arg1), SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_PushProvider" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_Push" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- wxPyArtProvider::PushProvider(arg1);
+ wxPyArtProvider::Push(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -20455,7 +20455,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_InsertProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
int res1 = 0 ;
@@ -20464,14 +20464,14 @@ SWIGINTERN PyObject *_wrap_ArtProvider_InsertProvider(PyObject *SWIGUNUSEDPARM(s
(char *) "provider", NULL
};
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_InsertProvider",kwnames,&obj0)) SWIG_fail;
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_Insert",kwnames,&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, SWIG_as_voidptrptr(&arg1), SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_InsertProvider" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_Insert" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- wxPyArtProvider::InsertProvider(arg1);
+ wxPyArtProvider::Insert(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -20482,14 +20482,14 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_PopProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
bool result;
- if (!SWIG_Python_UnpackTuple(args,"ArtProvider_PopProvider",0,0,0)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args,"ArtProvider_Pop",0,0,0)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)wxPyArtProvider::PopProvider();
+ result = (bool)wxPyArtProvider::Pop();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -20502,7 +20502,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_ArtProvider_Delete(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
bool result;
@@ -20513,15 +20513,15 @@ SWIGINTERN PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *SWIGUNUSEDPARM(s
(char *) "provider", NULL
};
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_RemoveProvider",kwnames,&obj0)) SWIG_fail;
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_Delete",kwnames,&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyArtProvider, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_RemoveProvider" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_Delete" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
}
arg1 = reinterpret_cast< wxPyArtProvider * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)wxPyArtProvider::RemoveProvider(arg1);
+ result = (bool)wxPyArtProvider::Delete(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -37887,10 +37887,10 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"new_ArtProvider", (PyCFunction)_wrap_new_ArtProvider, METH_NOARGS, NULL},
{ (char *)"delete_ArtProvider", (PyCFunction)_wrap_delete_ArtProvider, METH_O, NULL},
{ (char *)"ArtProvider__setCallbackInfo", (PyCFunction) _wrap_ArtProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
- { (char *)"ArtProvider_PushProvider", (PyCFunction) _wrap_ArtProvider_PushProvider, METH_VARARGS | METH_KEYWORDS, NULL},
- { (char *)"ArtProvider_InsertProvider", (PyCFunction) _wrap_ArtProvider_InsertProvider, METH_VARARGS | METH_KEYWORDS, NULL},
- { (char *)"ArtProvider_PopProvider", (PyCFunction)_wrap_ArtProvider_PopProvider, METH_NOARGS, NULL},
- { (char *)"ArtProvider_RemoveProvider", (PyCFunction) _wrap_ArtProvider_RemoveProvider, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ArtProvider_Push", (PyCFunction) _wrap_ArtProvider_Push, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ArtProvider_Insert", (PyCFunction) _wrap_ArtProvider_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ArtProvider_Pop", (PyCFunction)_wrap_ArtProvider_Pop, METH_NOARGS, NULL},
+ { (char *)"ArtProvider_Delete", (PyCFunction) _wrap_ArtProvider_Delete, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ArtProvider_GetBitmap", (PyCFunction) _wrap_ArtProvider_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ArtProvider_GetIcon", (PyCFunction) _wrap_ArtProvider_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ArtProvider_GetSizeHint", (PyCFunction) _wrap_ArtProvider_GetSizeHint, METH_VARARGS | METH_KEYWORDS, NULL},
--
2.47.2