diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index c2bb116550..bc65d332d6 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -2548,16 +2548,16 @@ class ArtProvider(object): return _misc_.ArtProvider_GetIcon(*args, **kwargs) GetIcon = staticmethod(GetIcon) - def GetSize(*args, **kwargs): + def GetSizeHint(*args, **kwargs): """ - GetSize(String client, bool platform_dependent=False) -> Size + GetSizeHint(String client, bool platform_dependent=False) -> Size - Get the size of an icon from a specific Art Client, queries the + Get the size hint of an icon from a specific Art Client, queries the topmost provider if platform_dependent = false """ - return _misc_.ArtProvider_GetSize(*args, **kwargs) + return _misc_.ArtProvider_GetSizeHint(*args, **kwargs) - GetSize = staticmethod(GetSize) + GetSizeHint = staticmethod(GetSizeHint) def Destroy(*args, **kwargs): """Destroy(self)""" return _misc_.ArtProvider_Destroy(*args, **kwargs) @@ -2668,14 +2668,14 @@ def ArtProvider_GetIcon(*args, **kwargs): """ return _misc_.ArtProvider_GetIcon(*args, **kwargs) -def ArtProvider_GetSize(*args, **kwargs): +def ArtProvider_GetSizeHint(*args, **kwargs): """ - ArtProvider_GetSize(String client, bool platform_dependent=False) -> Size + ArtProvider_GetSizeHint(String client, bool platform_dependent=False) -> Size - Get the size of an icon from a specific Art Client, queries the + Get the size hint of an icon from a specific Art Client, queries the topmost provider if platform_dependent = false """ - return _misc_.ArtProvider_GetSize(*args, **kwargs) + return _misc_.ArtProvider_GetSizeHint(*args, **kwargs) #--------------------------------------------------------------------------- diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index e8d9fbfb4b..513ffab6b0 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -16752,7 +16752,7 @@ static PyObject *_wrap_ArtProvider_GetIcon(PyObject *, PyObject *args, PyObject } -static PyObject *_wrap_ArtProvider_GetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_ArtProvider_GetSizeHint(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; bool arg2 = (bool) false ; @@ -16764,7 +16764,7 @@ static PyObject *_wrap_ArtProvider_GetSize(PyObject *, PyObject *args, PyObject (char *) "client",(char *) "platform_dependent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ArtProvider_GetSize",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ArtProvider_GetSizeHint",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -16778,7 +16778,7 @@ static PyObject *_wrap_ArtProvider_GetSize(PyObject *, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = wxPyArtProvider::GetSize((wxString const &)*arg1,arg2); + result = wxPyArtProvider::GetSizeHint((wxString const &)*arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -31774,7 +31774,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ArtProvider_RemoveProvider", (PyCFunction) _wrap_ArtProvider_RemoveProvider, 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_GetSize", (PyCFunction) _wrap_ArtProvider_GetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ArtProvider_GetSizeHint", (PyCFunction) _wrap_ArtProvider_GetSizeHint, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_Destroy", (PyCFunction) _wrap_ArtProvider_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_swigregister", ArtProvider_swigregister, METH_VARARGS, NULL}, { (char *)"delete_ConfigBase", (PyCFunction) _wrap_delete_ConfigBase, METH_VARARGS | METH_KEYWORDS, NULL},