From 0c549c5fd6e5dcbb890a0181dbe9b73c24035880 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 12 Mar 2005 20:26:57 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/msw/_misc.py | 26 ++++++++----- wxPython/src/msw/_misc_wrap.cpp | 67 +++++++++++++++++++++++++++++++-- wxPython/wxPython/_misc.py | 2 +- 3 files changed, 81 insertions(+), 14 deletions(-) diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index e8dad44f9b..3ed6cb61ac 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_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) #--------------------------------------------------------------------------- @@ -5290,6 +5290,14 @@ class DropTarget(object): """GetData(self) -> bool""" return _misc_.DropTarget_GetData(*args, **kwargs) + def SetDefaultAction(*args, **kwargs): + """SetDefaultAction(self, int action)""" + return _misc_.DropTarget_SetDefaultAction(*args, **kwargs) + + def GetDefaultAction(*args, **kwargs): + """GetDefaultAction(self) -> int""" + return _misc_.DropTarget_GetDefaultAction(*args, **kwargs) + class DropTargetPtr(DropTarget): def __init__(self, this): diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp index 8438a7651b..e0a3b56bb7 100644 --- a/wxPython/src/msw/_misc_wrap.cpp +++ b/wxPython/src/msw/_misc_wrap.cpp @@ -16743,7 +16743,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 ; @@ -16755,7 +16755,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; @@ -16769,7 +16769,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; @@ -29157,6 +29157,63 @@ static PyObject *_wrap_DropTarget_GetData(PyObject *, PyObject *args, PyObject * } +static PyObject *_wrap_DropTarget_SetDefaultAction(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ; + wxDragResult arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "action", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DropTarget_SetDefaultAction",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDropTarget, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (wxDragResult)(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDefaultAction((wxDragResult )arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_DropTarget_GetDefaultAction(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ; + wxDragResult result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DropTarget_GetDefaultAction",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDropTarget, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxDragResult)(arg1)->GetDefaultAction(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int((result)); + return resultobj; + fail: + return NULL; +} + + static PyObject * DropTarget_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -31773,7 +31830,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}, @@ -32109,6 +32166,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"DropTarget_base_OnLeave", (PyCFunction) _wrap_DropTarget_base_OnLeave, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_base_OnDrop", (PyCFunction) _wrap_DropTarget_base_OnDrop, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_GetData", (PyCFunction) _wrap_DropTarget_GetData, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DropTarget_SetDefaultAction", (PyCFunction) _wrap_DropTarget_SetDefaultAction, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DropTarget_GetDefaultAction", (PyCFunction) _wrap_DropTarget_GetDefaultAction, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_swigregister", DropTarget_swigregister, METH_VARARGS, NULL}, { (char *)"new_TextDropTarget", (PyCFunction) _wrap_new_TextDropTarget, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextDropTarget__setCallbackInfo", (PyCFunction) _wrap_TextDropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/wxPython/_misc.py b/wxPython/wxPython/_misc.py index 1594fd3ecf..2c8950bf1e 100644 --- a/wxPython/wxPython/_misc.py +++ b/wxPython/wxPython/_misc.py @@ -453,7 +453,7 @@ wxArtProvider_PopProvider = wx._misc.ArtProvider_PopProvider wxArtProvider_RemoveProvider = wx._misc.ArtProvider_RemoveProvider wxArtProvider_GetBitmap = wx._misc.ArtProvider_GetBitmap wxArtProvider_GetIcon = wx._misc.ArtProvider_GetIcon -wxArtProvider_GetSize = wx._misc.ArtProvider_GetSize +wxArtProvider_GetSizeHint = wx._misc.ArtProvider_GetSizeHint wxCONFIG_USE_LOCAL_FILE = wx._misc.CONFIG_USE_LOCAL_FILE wxCONFIG_USE_GLOBAL_FILE = wx._misc.CONFIG_USE_GLOBAL_FILE wxCONFIG_USE_RELATIVE_PATH = wx._misc.CONFIG_USE_RELATIVE_PATH