From 58203fa6b865e22fbde72f815e6616cc01fe690a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 27 Jan 2004 02:38:53 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/gizmos/gtk/gizmos.py | 12 +- wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp | 6 +- wxPython/contrib/gizmos/mac/gizmos.py | 12 +- wxPython/contrib/gizmos/mac/gizmos_wrap.cpp | 6 +- wxPython/contrib/gizmos/msw/gizmos.py | 12 +- wxPython/contrib/gizmos/msw/gizmos_wrap.cpp | 6 +- wxPython/contrib/glcanvas/gtk/glcanvas.py | 6 +- .../contrib/glcanvas/gtk/glcanvas_wrap.cpp | 6 +- wxPython/contrib/glcanvas/mac/glcanvas.py | 6 +- .../contrib/glcanvas/mac/glcanvas_wrap.cpp | 6 +- wxPython/src/gtk/calendar_wrap.cpp | 13 +- wxPython/src/gtk/controls.py | 18 +- wxPython/src/gtk/controls_wrap.cpp | 210 +++++++++--------- wxPython/src/gtk/core.py | 4 +- wxPython/src/gtk/core_wrap.cpp | 2 +- wxPython/src/gtk/misc.py | 9 +- wxPython/src/gtk/misc_wrap.cpp | 10 +- wxPython/src/mac/calendar_wrap.cpp | 13 +- wxPython/src/mac/controls.py | 18 +- wxPython/src/mac/controls_wrap.cpp | 210 +++++++++--------- wxPython/src/mac/core.py | 4 +- wxPython/src/mac/core_wrap.cpp | 2 +- wxPython/src/mac/misc.py | 9 +- wxPython/src/mac/misc_wrap.cpp | 10 +- wxPython/src/msw/calendar_wrap.cpp | 13 +- wxPython/src/msw/controls.py | 18 +- wxPython/src/msw/controls_wrap.cpp | 210 +++++++++--------- wxPython/src/msw/core.py | 4 +- wxPython/src/msw/core_wrap.cpp | 2 +- wxPython/src/msw/misc.py | 9 +- wxPython/src/msw/misc_wrap.cpp | 10 +- 31 files changed, 399 insertions(+), 477 deletions(-) diff --git a/wxPython/contrib/gizmos/gtk/gizmos.py b/wxPython/contrib/gizmos/gtk/gizmos.py index 4e081d708d..bff31a6e88 100644 --- a/wxPython/contrib/gizmos/gtk/gizmos.py +++ b/wxPython/contrib/gizmos/gtk/gizmos.py @@ -490,21 +490,15 @@ class TreeListCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList)""" - val = _gizmos.TreeListCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _gizmos.TreeListCtrl_AssignImageList(*args, **kwargs) def AssignStateImageList(*args, **kwargs): """AssignStateImageList(ImageList imageList)""" - val = _gizmos.TreeListCtrl_AssignStateImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _gizmos.TreeListCtrl_AssignStateImageList(*args, **kwargs) def AssignButtonsImageList(*args, **kwargs): """AssignButtonsImageList(ImageList imageList)""" - val = _gizmos.TreeListCtrl_AssignButtonsImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _gizmos.TreeListCtrl_AssignButtonsImageList(*args, **kwargs) def AddColumn(*args, **kwargs): """AddColumn(String text)""" diff --git a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp index b9babe9249..20571cd014 100644 --- a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp @@ -2996,7 +2996,7 @@ static PyObject *_wrap_TreeListCtrl_AssignImageList(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AssignImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2); @@ -3023,7 +3023,7 @@ static PyObject *_wrap_TreeListCtrl_AssignStateImageList(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AssignStateImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignStateImageList(arg2); @@ -3050,7 +3050,7 @@ static PyObject *_wrap_TreeListCtrl_AssignButtonsImageList(PyObject *self, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AssignButtonsImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignButtonsImageList(arg2); diff --git a/wxPython/contrib/gizmos/mac/gizmos.py b/wxPython/contrib/gizmos/mac/gizmos.py index 4e081d708d..bff31a6e88 100644 --- a/wxPython/contrib/gizmos/mac/gizmos.py +++ b/wxPython/contrib/gizmos/mac/gizmos.py @@ -490,21 +490,15 @@ class TreeListCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList)""" - val = _gizmos.TreeListCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _gizmos.TreeListCtrl_AssignImageList(*args, **kwargs) def AssignStateImageList(*args, **kwargs): """AssignStateImageList(ImageList imageList)""" - val = _gizmos.TreeListCtrl_AssignStateImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _gizmos.TreeListCtrl_AssignStateImageList(*args, **kwargs) def AssignButtonsImageList(*args, **kwargs): """AssignButtonsImageList(ImageList imageList)""" - val = _gizmos.TreeListCtrl_AssignButtonsImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _gizmos.TreeListCtrl_AssignButtonsImageList(*args, **kwargs) def AddColumn(*args, **kwargs): """AddColumn(String text)""" diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp index b8b03c458f..238ea0f324 100644 --- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp @@ -2996,7 +2996,7 @@ static PyObject *_wrap_TreeListCtrl_AssignImageList(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AssignImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2); @@ -3023,7 +3023,7 @@ static PyObject *_wrap_TreeListCtrl_AssignStateImageList(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AssignStateImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignStateImageList(arg2); @@ -3050,7 +3050,7 @@ static PyObject *_wrap_TreeListCtrl_AssignButtonsImageList(PyObject *self, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AssignButtonsImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignButtonsImageList(arg2); diff --git a/wxPython/contrib/gizmos/msw/gizmos.py b/wxPython/contrib/gizmos/msw/gizmos.py index 4e081d708d..bff31a6e88 100644 --- a/wxPython/contrib/gizmos/msw/gizmos.py +++ b/wxPython/contrib/gizmos/msw/gizmos.py @@ -490,21 +490,15 @@ class TreeListCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList)""" - val = _gizmos.TreeListCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _gizmos.TreeListCtrl_AssignImageList(*args, **kwargs) def AssignStateImageList(*args, **kwargs): """AssignStateImageList(ImageList imageList)""" - val = _gizmos.TreeListCtrl_AssignStateImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _gizmos.TreeListCtrl_AssignStateImageList(*args, **kwargs) def AssignButtonsImageList(*args, **kwargs): """AssignButtonsImageList(ImageList imageList)""" - val = _gizmos.TreeListCtrl_AssignButtonsImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _gizmos.TreeListCtrl_AssignButtonsImageList(*args, **kwargs) def AddColumn(*args, **kwargs): """AddColumn(String text)""" diff --git a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp index d43ea3e0e0..ef71c65a17 100644 --- a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp @@ -2996,7 +2996,7 @@ static PyObject *_wrap_TreeListCtrl_AssignImageList(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AssignImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2); @@ -3023,7 +3023,7 @@ static PyObject *_wrap_TreeListCtrl_AssignStateImageList(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AssignStateImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignStateImageList(arg2); @@ -3050,7 +3050,7 @@ static PyObject *_wrap_TreeListCtrl_AssignButtonsImageList(PyObject *self, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AssignButtonsImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignButtonsImageList(arg2); diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.py b/wxPython/contrib/glcanvas/gtk/glcanvas.py index e72e91fd30..77c201f8f0 100644 --- a/wxPython/contrib/glcanvas/gtk/glcanvas.py +++ b/wxPython/contrib/glcanvas/gtk/glcanvas.py @@ -120,14 +120,14 @@ class GLCanvasPtr(GLCanvas): self.__class__ = GLCanvas _glcanvas.GLCanvas_swigregister(GLCanvasPtr) -def wxGLCanvasWithContext(*args, **kwargs): +def GLCanvasWithContext(*args, **kwargs): """ - wxGLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, + GLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, Size size=DefaultSize, long style=0, String name=GLCanvasNameStr, int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas """ - val = _glcanvas.new_wxGLCanvasWithContext(*args, **kwargs) + val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs) val.thisown = 1 val._setOORInfo(val) return val diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp index 6049427448..4868ca4410 100644 --- a/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp +++ b/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp @@ -829,7 +829,7 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw } -static PyObject *_wrap_new_wxGLCanvasWithContext(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxGLContext *arg2 = (wxGLContext *) NULL ; @@ -860,7 +860,7 @@ static PyObject *_wrap_new_wxGLCanvasWithContext(PyObject *self, PyObject *args, (char *) "parent",(char *) "shared",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name",(char *) "attribList",(char *) "palette", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OiOOlOOO:new_wxGLCanvasWithContext",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OiOOlOOO:new_GLCanvasWithContext",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGLContext,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -1065,7 +1065,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GLContext_GetWindow", (PyCFunction) _wrap_GLContext_GetWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"GLContext_swigregister", GLContext_swigregister, METH_VARARGS }, { (char *)"new_GLCanvas", (PyCFunction) _wrap_new_GLCanvas, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_wxGLCanvasWithContext", (PyCFunction) _wrap_new_wxGLCanvasWithContext, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_GLCanvasWithContext", (PyCFunction) _wrap_new_GLCanvasWithContext, METH_VARARGS | METH_KEYWORDS }, { (char *)"GLCanvas_SetCurrent", (PyCFunction) _wrap_GLCanvas_SetCurrent, METH_VARARGS | METH_KEYWORDS }, { (char *)"GLCanvas_SetColour", (PyCFunction) _wrap_GLCanvas_SetColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"GLCanvas_SwapBuffers", (PyCFunction) _wrap_GLCanvas_SwapBuffers, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/contrib/glcanvas/mac/glcanvas.py b/wxPython/contrib/glcanvas/mac/glcanvas.py index a5991cbf2d..a90baddb0f 100644 --- a/wxPython/contrib/glcanvas/mac/glcanvas.py +++ b/wxPython/contrib/glcanvas/mac/glcanvas.py @@ -104,14 +104,14 @@ class GLCanvasPtr(GLCanvas): self.__class__ = GLCanvas _glcanvas.GLCanvas_swigregister(GLCanvasPtr) -def wxGLCanvasWithContext(*args, **kwargs): +def GLCanvasWithContext(*args, **kwargs): """ - wxGLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, + GLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, Size size=DefaultSize, long style=0, String name=GLCanvasNameStr, int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas """ - val = _glcanvas.new_wxGLCanvasWithContext(*args, **kwargs) + val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs) val.thisown = 1 val._setOORInfo(val) return val diff --git a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp index f7cb67f770..6aad6de89e 100644 --- a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp +++ b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp @@ -725,7 +725,7 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw } -static PyObject *_wrap_new_wxGLCanvasWithContext(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxGLContext *arg2 = (wxGLContext *) NULL ; @@ -756,7 +756,7 @@ static PyObject *_wrap_new_wxGLCanvasWithContext(PyObject *self, PyObject *args, (char *) "parent",(char *) "shared",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name",(char *) "attribList",(char *) "palette", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OiOOlOOO:new_wxGLCanvasWithContext",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OiOOlOOO:new_GLCanvasWithContext",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGLContext,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -957,7 +957,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GLContext_GetWindow", (PyCFunction) _wrap_GLContext_GetWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"GLContext_swigregister", GLContext_swigregister, METH_VARARGS }, { (char *)"new_GLCanvas", (PyCFunction) _wrap_new_GLCanvas, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_wxGLCanvasWithContext", (PyCFunction) _wrap_new_wxGLCanvasWithContext, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_GLCanvasWithContext", (PyCFunction) _wrap_new_GLCanvasWithContext, METH_VARARGS | METH_KEYWORDS }, { (char *)"GLCanvas_SetCurrent", (PyCFunction) _wrap_GLCanvas_SetCurrent, METH_VARARGS | METH_KEYWORDS }, { (char *)"GLCanvas_SetColour", (PyCFunction) _wrap_GLCanvas_SetColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"GLCanvas_SwapBuffers", (PyCFunction) _wrap_GLCanvas_SwapBuffers, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/gtk/calendar_wrap.cpp b/wxPython/src/gtk/calendar_wrap.cpp index a07bde18ce..61ae12a89f 100644 --- a/wxPython/src/gtk/calendar_wrap.cpp +++ b/wxPython/src/gtk/calendar_wrap.cpp @@ -1013,7 +1013,7 @@ static PyObject *_wrap_new_CalendarEvent(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_CalendarEvent_GetDate(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ; - wxDateTime *result; + wxDateTime result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -1023,15 +1023,16 @@ static PyObject *_wrap_CalendarEvent_GetDate(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxDateTime const &_result_ref = ((wxCalendarEvent const *)arg1)->GetDate(); - result = (wxDateTime *) &_result_ref; - } + result = ((wxCalendarEvent const *)arg1)->GetDate(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxDateTime, 0); + { + wxDateTime * resultptr; + resultptr = new wxDateTime((wxDateTime &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxDateTime, 1); + } return resultobj; fail: return NULL; diff --git a/wxPython/src/gtk/controls.py b/wxPython/src/gtk/controls.py index 3e4aee8e68..7130c9506e 100644 --- a/wxPython/src/gtk/controls.py +++ b/wxPython/src/gtk/controls.py @@ -1926,9 +1926,7 @@ class BookCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList)""" - val = _controls.BookCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.BookCtrl_AssignImageList(*args, **kwargs) def GetImageList(*args, **kwargs): """GetImageList() -> ImageList""" @@ -3383,9 +3381,7 @@ class ListCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList, int which)""" - val = _controls.ListCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.ListCtrl_AssignImageList(*args, **kwargs) def IsVirtual(*args, **kwargs): """IsVirtual() -> bool""" @@ -3955,15 +3951,11 @@ class TreeCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList)""" - val = _controls.TreeCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.TreeCtrl_AssignImageList(*args, **kwargs) def AssignStateImageList(*args, **kwargs): """AssignStateImageList(ImageList imageList)""" - val = _controls.TreeCtrl_AssignStateImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.TreeCtrl_AssignStateImageList(*args, **kwargs) def GetItemText(*args, **kwargs): """GetItemText(TreeItemId item) -> String""" @@ -4076,7 +4068,7 @@ class TreeCtrl(core.Control): return _controls.TreeCtrl_GetFirstChild(*args, **kwargs) def GetNextChild(*args, **kwargs): - """GetNextChild(TreeItemId item, wxTreeItemIdValue cookie) -> PyObject""" + """GetNextChild(TreeItemId item, void cookie) -> PyObject""" return _controls.TreeCtrl_GetNextChild(*args, **kwargs) def GetLastChild(*args, **kwargs): diff --git a/wxPython/src/gtk/controls_wrap.cpp b/wxPython/src/gtk/controls_wrap.cpp index 61f16d2bd6..f8eb6d8383 100644 --- a/wxPython/src/gtk/controls_wrap.cpp +++ b/wxPython/src/gtk/controls_wrap.cpp @@ -384,88 +384,87 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxTextUrlEvent swig_types[0] #define SWIGTYPE_p_wxBookCtrlEvent swig_types[1] #define SWIGTYPE_p_wxSizer swig_types[2] -#define SWIGTYPE_p_wxTreeItemIdValue swig_types[3] -#define SWIGTYPE_wxTreeItemIdValue swig_types[4] -#define SWIGTYPE_p_wxCheckBox swig_types[5] -#define SWIGTYPE_p_wxPyTreeCtrl swig_types[6] -#define SWIGTYPE_p_wxEvent swig_types[7] -#define SWIGTYPE_p_wxGenericDirCtrl swig_types[8] -#define SWIGTYPE_p_bool swig_types[9] -#define SWIGTYPE_p_wxPyTreeItemData swig_types[10] -#define SWIGTYPE_p_wxItemContainer swig_types[11] -#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[12] -#define SWIGTYPE_p_wxPyListCtrl swig_types[13] -#define SWIGTYPE_p_wxStaticLine swig_types[14] -#define SWIGTYPE_p_wxControl swig_types[15] -#define SWIGTYPE_p_wxPyControl swig_types[16] -#define SWIGTYPE_p_wxGauge swig_types[17] -#define SWIGTYPE_p_wxToolBarBase swig_types[18] -#define SWIGTYPE_p_wxFont swig_types[19] -#define SWIGTYPE_p_wxToggleButton swig_types[20] -#define SWIGTYPE_p_wxRadioButton swig_types[21] -#define SWIGTYPE_p_wxChoice swig_types[22] -#define SWIGTYPE_p_wxMemoryDC swig_types[23] -#define SWIGTYPE_p_wxListItemAttr swig_types[24] -#define SWIGTYPE_p_int swig_types[25] -#define SWIGTYPE_p_wxSize swig_types[26] -#define SWIGTYPE_p_wxDC swig_types[27] -#define SWIGTYPE_p_wxListView swig_types[28] -#define SWIGTYPE_p_wxIcon swig_types[29] -#define SWIGTYPE_p_wxTextCtrl swig_types[30] -#define SWIGTYPE_p_wxNotebook swig_types[31] -#define SWIGTYPE_p_wxNotifyEvent swig_types[32] -#define SWIGTYPE_p_wxArrayString swig_types[33] -#define SWIGTYPE_p_wxListbook swig_types[34] -#define SWIGTYPE_p_wxStaticBitmap swig_types[35] -#define SWIGTYPE_p_wxSlider swig_types[36] -#define SWIGTYPE_p_wxStaticBox swig_types[37] -#define SWIGTYPE_p_wxArrayInt swig_types[38] -#define SWIGTYPE_p_wxContextHelp swig_types[39] -#define SWIGTYPE_p_long swig_types[40] -#define SWIGTYPE_p_wxEvtHandler swig_types[41] -#define SWIGTYPE_p_wxListEvent swig_types[42] -#define SWIGTYPE_p_wxListBox swig_types[43] -#define SWIGTYPE_p_wxCheckListBox swig_types[44] -#define SWIGTYPE_p_wxBookCtrl swig_types[45] -#define SWIGTYPE_p_wxSpinButton swig_types[46] -#define SWIGTYPE_p_wxButton swig_types[47] -#define SWIGTYPE_p_wxBitmapButton swig_types[48] -#define SWIGTYPE_p_wxRect swig_types[49] -#define SWIGTYPE_p_wxContextHelpButton swig_types[50] -#define SWIGTYPE_p_wxRadioBox swig_types[51] -#define SWIGTYPE_p_wxScrollBar swig_types[52] -#define SWIGTYPE_p_wxTreeItemId swig_types[53] -#define SWIGTYPE_p_wxComboBox swig_types[54] -#define SWIGTYPE_p_wxHelpEvent swig_types[55] -#define SWIGTYPE_p_wxListItem swig_types[56] -#define SWIGTYPE_p_wxNotebookSizer swig_types[57] -#define SWIGTYPE_p_wxSpinEvent swig_types[58] -#define SWIGTYPE_p_wxGenericDragImage swig_types[59] -#define SWIGTYPE_p_wxSpinCtrl swig_types[60] -#define SWIGTYPE_p_wxImageList swig_types[61] -#define SWIGTYPE_p_wxHelpProvider swig_types[62] -#define SWIGTYPE_p_wxTextAttr swig_types[63] -#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[64] -#define SWIGTYPE_p_wxPoint swig_types[65] -#define SWIGTYPE_p_wxListbookEvent swig_types[66] -#define SWIGTYPE_p_wxNotebookEvent swig_types[67] -#define SWIGTYPE_p_wxObject swig_types[68] -#define SWIGTYPE_p_wxCursor swig_types[69] -#define SWIGTYPE_p_wxKeyEvent swig_types[70] -#define SWIGTYPE_p_wxWindow swig_types[71] -#define SWIGTYPE_p_wxString swig_types[72] -#define SWIGTYPE_p_wxBitmap swig_types[73] -#define SWIGTYPE_p_wxTreeEvent swig_types[74] -#define SWIGTYPE_p_wxMouseEvent swig_types[75] -#define SWIGTYPE_p_wxCommandEvent swig_types[76] -#define SWIGTYPE_p_wxStaticText swig_types[77] -#define SWIGTYPE_p_wxControlWithItems swig_types[78] -#define SWIGTYPE_p_wxToolBarToolBase swig_types[79] -#define SWIGTYPE_p_wxColour swig_types[80] -#define SWIGTYPE_p_wxToolBar swig_types[81] -#define SWIGTYPE_p_wxBookCtrlSizer swig_types[82] -#define SWIGTYPE_p_wxValidator swig_types[83] -static swig_type_info *swig_types[85]; +#define SWIGTYPE_p_wxCheckBox swig_types[3] +#define SWIGTYPE_p_wxPyTreeCtrl swig_types[4] +#define SWIGTYPE_p_wxEvent swig_types[5] +#define SWIGTYPE_p_wxGenericDirCtrl swig_types[6] +#define SWIGTYPE_p_bool swig_types[7] +#define SWIGTYPE_p_wxPyTreeItemData swig_types[8] +#define SWIGTYPE_p_wxItemContainer swig_types[9] +#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[10] +#define SWIGTYPE_p_wxPyListCtrl swig_types[11] +#define SWIGTYPE_p_wxStaticLine swig_types[12] +#define SWIGTYPE_p_wxControl swig_types[13] +#define SWIGTYPE_p_wxPyControl swig_types[14] +#define SWIGTYPE_p_wxGauge swig_types[15] +#define SWIGTYPE_p_wxToolBarBase swig_types[16] +#define SWIGTYPE_p_wxFont swig_types[17] +#define SWIGTYPE_p_wxToggleButton swig_types[18] +#define SWIGTYPE_p_wxRadioButton swig_types[19] +#define SWIGTYPE_p_wxChoice swig_types[20] +#define SWIGTYPE_p_wxMemoryDC swig_types[21] +#define SWIGTYPE_p_wxListItemAttr swig_types[22] +#define SWIGTYPE_p_void swig_types[23] +#define SWIGTYPE_p_int swig_types[24] +#define SWIGTYPE_p_wxSize swig_types[25] +#define SWIGTYPE_p_wxDC swig_types[26] +#define SWIGTYPE_p_wxListView swig_types[27] +#define SWIGTYPE_p_wxIcon swig_types[28] +#define SWIGTYPE_p_wxTextCtrl swig_types[29] +#define SWIGTYPE_p_wxNotebook swig_types[30] +#define SWIGTYPE_p_wxNotifyEvent swig_types[31] +#define SWIGTYPE_p_wxArrayString swig_types[32] +#define SWIGTYPE_p_wxListbook swig_types[33] +#define SWIGTYPE_p_wxStaticBitmap swig_types[34] +#define SWIGTYPE_p_wxSlider swig_types[35] +#define SWIGTYPE_p_wxStaticBox swig_types[36] +#define SWIGTYPE_p_wxArrayInt swig_types[37] +#define SWIGTYPE_p_wxContextHelp swig_types[38] +#define SWIGTYPE_p_long swig_types[39] +#define SWIGTYPE_p_wxEvtHandler swig_types[40] +#define SWIGTYPE_p_wxListEvent swig_types[41] +#define SWIGTYPE_p_wxListBox swig_types[42] +#define SWIGTYPE_p_wxCheckListBox swig_types[43] +#define SWIGTYPE_p_wxBookCtrl swig_types[44] +#define SWIGTYPE_p_wxSpinButton swig_types[45] +#define SWIGTYPE_p_wxButton swig_types[46] +#define SWIGTYPE_p_wxBitmapButton swig_types[47] +#define SWIGTYPE_p_wxRect swig_types[48] +#define SWIGTYPE_p_wxContextHelpButton swig_types[49] +#define SWIGTYPE_p_wxRadioBox swig_types[50] +#define SWIGTYPE_p_wxScrollBar swig_types[51] +#define SWIGTYPE_p_wxTreeItemId swig_types[52] +#define SWIGTYPE_p_wxComboBox swig_types[53] +#define SWIGTYPE_p_wxHelpEvent swig_types[54] +#define SWIGTYPE_p_wxListItem swig_types[55] +#define SWIGTYPE_p_wxNotebookSizer swig_types[56] +#define SWIGTYPE_p_wxSpinEvent swig_types[57] +#define SWIGTYPE_p_wxGenericDragImage swig_types[58] +#define SWIGTYPE_p_wxSpinCtrl swig_types[59] +#define SWIGTYPE_p_wxImageList swig_types[60] +#define SWIGTYPE_p_wxHelpProvider swig_types[61] +#define SWIGTYPE_p_wxTextAttr swig_types[62] +#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[63] +#define SWIGTYPE_p_wxPoint swig_types[64] +#define SWIGTYPE_p_wxListbookEvent swig_types[65] +#define SWIGTYPE_p_wxNotebookEvent swig_types[66] +#define SWIGTYPE_p_wxObject swig_types[67] +#define SWIGTYPE_p_wxCursor swig_types[68] +#define SWIGTYPE_p_wxKeyEvent swig_types[69] +#define SWIGTYPE_p_wxWindow swig_types[70] +#define SWIGTYPE_p_wxString swig_types[71] +#define SWIGTYPE_p_wxBitmap swig_types[72] +#define SWIGTYPE_p_wxTreeEvent swig_types[73] +#define SWIGTYPE_p_wxMouseEvent swig_types[74] +#define SWIGTYPE_p_wxCommandEvent swig_types[75] +#define SWIGTYPE_p_wxStaticText swig_types[76] +#define SWIGTYPE_p_wxControlWithItems swig_types[77] +#define SWIGTYPE_p_wxToolBarToolBase swig_types[78] +#define SWIGTYPE_p_wxColour swig_types[79] +#define SWIGTYPE_p_wxToolBar swig_types[80] +#define SWIGTYPE_p_wxBookCtrlSizer swig_types[81] +#define SWIGTYPE_p_wxValidator swig_types[82] +static swig_type_info *swig_types[84]; /* -------- TYPES TABLE (END) -------- */ @@ -831,21 +830,21 @@ PyObject *wxPyTreeCtrl_GetSelections(wxPyTreeCtrl *self){ return rval; } PyObject *wxPyTreeCtrl_GetFirstChild(wxPyTreeCtrl *self,wxTreeItemId const &item){ - wxTreeItemIdValue cookie = 0; - wxTreeItemId ritem = self->GetFirstChild(item, cookie); + void* cookie = 0; + wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie)); wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True)); - PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True)); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); wxPyEndBlockThreads(); return tup; } -PyObject *wxPyTreeCtrl_GetNextChild(wxPyTreeCtrl *self,wxTreeItemId const &item,wxTreeItemIdValue &cookie){ - wxTreeItemId ritem = self->GetNextChild(item, cookie); +PyObject *wxPyTreeCtrl_GetNextChild(wxPyTreeCtrl *self,wxTreeItemId const &item,void *cookie){ + wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie)); wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True)); - PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True)); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); wxPyEndBlockThreads(); return tup; } @@ -11856,7 +11855,7 @@ static PyObject *_wrap_BookCtrl_AssignImageList(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_AssignImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2); @@ -19163,7 +19162,7 @@ static PyObject *_wrap_ListCtrl_AssignImageList(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:ListCtrl_AssignImageList",kwnames,&obj0,&obj1,&arg3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2,arg3); @@ -20607,7 +20606,7 @@ static PyObject *_wrap_TreeItemId___ne__(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_TreeItemId_m_pItem_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTreeItemId *arg1 = (wxTreeItemId *) 0 ; - wxTreeItemIdValue arg2 = (wxTreeItemIdValue) 0 ; + void *arg2 = (void *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -20629,7 +20628,7 @@ static PyObject *_wrap_TreeItemId_m_pItem_set(PyObject *self, PyObject *args, Py static PyObject *_wrap_TreeItemId_m_pItem_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTreeItemId *arg1 = (wxTreeItemId *) 0 ; - wxTreeItemIdValue result; + void *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -20637,9 +20636,9 @@ static PyObject *_wrap_TreeItemId_m_pItem_get(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TreeItemId_m_pItem_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxTreeItemIdValue) ((arg1)->m_pItem); + result = (void *) ((arg1)->m_pItem); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_wxTreeItemIdValue, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_void, 0); return resultobj; fail: return NULL; @@ -21746,7 +21745,7 @@ static PyObject *_wrap_TreeCtrl_AssignImageList(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_AssignImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2); @@ -21773,7 +21772,7 @@ static PyObject *_wrap_TreeCtrl_AssignStateImageList(PyObject *self, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_AssignStateImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignStateImageList(arg2); @@ -22701,7 +22700,7 @@ static PyObject *_wrap_TreeCtrl_GetNextChild(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxTreeItemIdValue *arg3 = 0 ; + void *arg3 = (void *) 0 ; PyObject *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -22716,13 +22715,10 @@ static PyObject *_wrap_TreeCtrl_GetNextChild(PyObject *self, PyObject *args, PyO if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxTreeItemIdValue,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg3 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + if ((SWIG_ConvertPtr(obj2,(void **) &arg3, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxPyTreeCtrl_GetNextChild(arg1,(wxTreeItemId const &)*arg2,*arg3); + result = (PyObject *)wxPyTreeCtrl_GetNextChild(arg1,(wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -28449,8 +28445,6 @@ static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { static swig_type_info _swigt__p_wxTextUrlEvent[] = {{"_p_wxTextUrlEvent", 0, "wxTextUrlEvent *", 0},{"_p_wxTextUrlEvent"},{0}}; static swig_type_info _swigt__p_wxBookCtrlEvent[] = {{"_p_wxBookCtrlEvent", 0, "wxBookCtrlEvent *", 0},{"_p_wxBookCtrlEvent"},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxBookCtrlEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxBookCtrlEvent},{0}}; static swig_type_info _swigt__p_wxSizer[] = {{"_p_wxSizer", 0, "wxSizer *", 0},{"_p_wxSizer"},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxSizer},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxSizer},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxSizer},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxSizer},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxSizer},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxSizer},{"_p_wxPySizer", _p_wxPySizerTo_p_wxSizer},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxSizer},{0}}; -static swig_type_info _swigt__p_wxTreeItemIdValue[] = {{"_p_wxTreeItemIdValue", 0, "wxTreeItemIdValue *", 0},{"_p_wxTreeItemIdValue"},{0}}; -static swig_type_info _swigt__wxTreeItemIdValue[] = {{"_wxTreeItemIdValue", 0, "wxTreeItemIdValue", 0},{"_wxTreeItemIdValue"},{0}}; static swig_type_info _swigt__p_wxCheckBox[] = {{"_p_wxCheckBox", 0, "wxCheckBox *", 0},{"_p_wxCheckBox"},{0}}; static swig_type_info _swigt__p_wxPyTreeCtrl[] = {{"_p_wxPyTreeCtrl", 0, "wxPyTreeCtrl *", 0},{"_p_wxPyTreeCtrl"},{0}}; static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxEvent},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxListEvent", _p_wxListEventTo_p_wxEvent},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxEvent},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxEvent},{"_p_wxEvent"},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{0}}; @@ -28471,6 +28465,7 @@ static swig_type_info _swigt__p_wxRadioButton[] = {{"_p_wxRadioButton", 0, "wxRa static swig_type_info _swigt__p_wxChoice[] = {{"_p_wxChoice", 0, "wxChoice *", 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxChoice},{"_p_wxChoice"},{0}}; static swig_type_info _swigt__p_wxMemoryDC[] = {{"_p_wxMemoryDC", 0, "wxMemoryDC *", 0},{"_p_wxMemoryDC"},{0}}; static swig_type_info _swigt__p_wxListItemAttr[] = {{"_p_wxListItemAttr", 0, "wxListItemAttr *", 0},{"_p_wxListItemAttr"},{0}}; +static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0},{"_p_void"},{0}}; static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}}; static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0},{"_p_wxSize"},{0}}; static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"},{0}}; @@ -28535,8 +28530,6 @@ static swig_type_info *swig_types_initial[] = { _swigt__p_wxTextUrlEvent, _swigt__p_wxBookCtrlEvent, _swigt__p_wxSizer, -_swigt__p_wxTreeItemIdValue, -_swigt__wxTreeItemIdValue, _swigt__p_wxCheckBox, _swigt__p_wxPyTreeCtrl, _swigt__p_wxEvent, @@ -28557,6 +28550,7 @@ _swigt__p_wxRadioButton, _swigt__p_wxChoice, _swigt__p_wxMemoryDC, _swigt__p_wxListItemAttr, +_swigt__p_void, _swigt__p_int, _swigt__p_wxSize, _swigt__p_wxDC, diff --git a/wxPython/src/gtk/core.py b/wxPython/src/gtk/core.py index 34fde12ac2..7a2f487c31 100644 --- a/wxPython/src/gtk/core.py +++ b/wxPython/src/gtk/core.py @@ -6007,9 +6007,7 @@ class Window(EvtHandler): def SetDropTarget(*args, **kwargs): """SetDropTarget(PyDropTarget dropTarget)""" - val = _core.Window_SetDropTarget(*args, **kwargs) - args[1].thisown = 0 - return val + return _core.Window_SetDropTarget(*args, **kwargs) def GetDropTarget(*args, **kwargs): """GetDropTarget() -> PyDropTarget""" diff --git a/wxPython/src/gtk/core_wrap.cpp b/wxPython/src/gtk/core_wrap.cpp index 3684f47fe6..988bc1f04f 100644 --- a/wxPython/src/gtk/core_wrap.cpp +++ b/wxPython/src/gtk/core_wrap.cpp @@ -24498,7 +24498,7 @@ static PyObject *_wrap_Window_SetDropTarget(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDropTarget",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDropTarget(arg2); diff --git a/wxPython/src/gtk/misc.py b/wxPython/src/gtk/misc.py index 7e5f2b3e48..e53833458f 100644 --- a/wxPython/src/gtk/misc.py +++ b/wxPython/src/gtk/misc.py @@ -4131,9 +4131,7 @@ class DataObjectComposite(DataObject): del newobj.thisown def Add(*args, **kwargs): """Add(DataObjectSimple dataObject, int preferred=False)""" - val = _misc.DataObjectComposite_Add(*args, **kwargs) - args[1].thisown = 0 - return val + return _misc.DataObjectComposite_Add(*args, **kwargs) class DataObjectCompositePtr(DataObjectComposite): @@ -4413,7 +4411,6 @@ class DropTarget(object): self.this = newobj.this self.thisown = 1 del newobj.thisown - if args: args[0].thisown = 0; self._setCallbackInfo(self, DropTarget) def _setCallbackInfo(*args, **kwargs): @@ -4432,9 +4429,7 @@ class DropTarget(object): def SetDataObject(*args, **kwargs): """SetDataObject(DataObject dataObject)""" - val = _misc.DropTarget_SetDataObject(*args, **kwargs) - args[1].thisown = 0 - return val + return _misc.DropTarget_SetDataObject(*args, **kwargs) def base_OnEnter(*args, **kwargs): """base_OnEnter(int x, int y, int def) -> int""" diff --git a/wxPython/src/gtk/misc_wrap.cpp b/wxPython/src/gtk/misc_wrap.cpp index bc7b845d90..cb0b0aeb18 100644 --- a/wxPython/src/gtk/misc_wrap.cpp +++ b/wxPython/src/gtk/misc_wrap.cpp @@ -22783,7 +22783,7 @@ static PyObject *_wrap_DataObjectComposite_Add(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:DataObjectComposite_Add",kwnames,&obj0,&obj1,&arg3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObjectComposite,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObjectSimple,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObjectSimple,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Add(arg2,arg3); @@ -23809,7 +23809,7 @@ static PyObject *_wrap_new_PyDropTarget(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyDropTarget",kwnames,&obj0)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23916,7 +23916,7 @@ static PyObject *_wrap_DropTarget_SetDataObject(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DropTarget_SetDataObject",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDataObject(arg2); @@ -24591,7 +24591,7 @@ static PyObject *_wrap_Clipboard_AddData(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Clipboard_AddData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxClipboard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->AddData(arg2); @@ -24619,7 +24619,7 @@ static PyObject *_wrap_Clipboard_SetData(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Clipboard_SetData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxClipboard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetData(arg2); diff --git a/wxPython/src/mac/calendar_wrap.cpp b/wxPython/src/mac/calendar_wrap.cpp index a07bde18ce..61ae12a89f 100644 --- a/wxPython/src/mac/calendar_wrap.cpp +++ b/wxPython/src/mac/calendar_wrap.cpp @@ -1013,7 +1013,7 @@ static PyObject *_wrap_new_CalendarEvent(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_CalendarEvent_GetDate(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ; - wxDateTime *result; + wxDateTime result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -1023,15 +1023,16 @@ static PyObject *_wrap_CalendarEvent_GetDate(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxDateTime const &_result_ref = ((wxCalendarEvent const *)arg1)->GetDate(); - result = (wxDateTime *) &_result_ref; - } + result = ((wxCalendarEvent const *)arg1)->GetDate(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxDateTime, 0); + { + wxDateTime * resultptr; + resultptr = new wxDateTime((wxDateTime &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxDateTime, 1); + } return resultobj; fail: return NULL; diff --git a/wxPython/src/mac/controls.py b/wxPython/src/mac/controls.py index 03b1a8d21e..79b2fa0deb 100644 --- a/wxPython/src/mac/controls.py +++ b/wxPython/src/mac/controls.py @@ -1902,9 +1902,7 @@ class BookCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList)""" - val = _controls.BookCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.BookCtrl_AssignImageList(*args, **kwargs) def GetImageList(*args, **kwargs): """GetImageList() -> ImageList""" @@ -3359,9 +3357,7 @@ class ListCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList, int which)""" - val = _controls.ListCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.ListCtrl_AssignImageList(*args, **kwargs) def IsVirtual(*args, **kwargs): """IsVirtual() -> bool""" @@ -3931,15 +3927,11 @@ class TreeCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList)""" - val = _controls.TreeCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.TreeCtrl_AssignImageList(*args, **kwargs) def AssignStateImageList(*args, **kwargs): """AssignStateImageList(ImageList imageList)""" - val = _controls.TreeCtrl_AssignStateImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.TreeCtrl_AssignStateImageList(*args, **kwargs) def GetItemText(*args, **kwargs): """GetItemText(TreeItemId item) -> String""" @@ -4052,7 +4044,7 @@ class TreeCtrl(core.Control): return _controls.TreeCtrl_GetFirstChild(*args, **kwargs) def GetNextChild(*args, **kwargs): - """GetNextChild(TreeItemId item, wxTreeItemIdValue cookie) -> PyObject""" + """GetNextChild(TreeItemId item, void cookie) -> PyObject""" return _controls.TreeCtrl_GetNextChild(*args, **kwargs) def GetLastChild(*args, **kwargs): diff --git a/wxPython/src/mac/controls_wrap.cpp b/wxPython/src/mac/controls_wrap.cpp index 4525e6d567..cf25d5f79f 100644 --- a/wxPython/src/mac/controls_wrap.cpp +++ b/wxPython/src/mac/controls_wrap.cpp @@ -384,88 +384,87 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxTextUrlEvent swig_types[0] #define SWIGTYPE_p_wxBookCtrlEvent swig_types[1] #define SWIGTYPE_p_wxSizer swig_types[2] -#define SWIGTYPE_p_wxTreeItemIdValue swig_types[3] -#define SWIGTYPE_wxTreeItemIdValue swig_types[4] -#define SWIGTYPE_p_wxCheckBox swig_types[5] -#define SWIGTYPE_p_wxPyTreeCtrl swig_types[6] -#define SWIGTYPE_p_wxEvent swig_types[7] -#define SWIGTYPE_p_wxGenericDirCtrl swig_types[8] -#define SWIGTYPE_p_bool swig_types[9] -#define SWIGTYPE_p_wxPyTreeItemData swig_types[10] -#define SWIGTYPE_p_wxItemContainer swig_types[11] -#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[12] -#define SWIGTYPE_p_wxPyListCtrl swig_types[13] -#define SWIGTYPE_p_wxStaticLine swig_types[14] -#define SWIGTYPE_p_wxControl swig_types[15] -#define SWIGTYPE_p_wxPyControl swig_types[16] -#define SWIGTYPE_p_wxGauge swig_types[17] -#define SWIGTYPE_p_wxToolBarBase swig_types[18] -#define SWIGTYPE_p_wxFont swig_types[19] -#define SWIGTYPE_p_wxToggleButton swig_types[20] -#define SWIGTYPE_p_wxRadioButton swig_types[21] -#define SWIGTYPE_p_wxChoice swig_types[22] -#define SWIGTYPE_p_wxMemoryDC swig_types[23] -#define SWIGTYPE_p_wxListItemAttr swig_types[24] -#define SWIGTYPE_p_int swig_types[25] -#define SWIGTYPE_p_wxSize swig_types[26] -#define SWIGTYPE_p_wxDC swig_types[27] -#define SWIGTYPE_p_wxListView swig_types[28] -#define SWIGTYPE_p_wxIcon swig_types[29] -#define SWIGTYPE_p_wxTextCtrl swig_types[30] -#define SWIGTYPE_p_wxNotebook swig_types[31] -#define SWIGTYPE_p_wxNotifyEvent swig_types[32] -#define SWIGTYPE_p_wxArrayString swig_types[33] -#define SWIGTYPE_p_wxListbook swig_types[34] -#define SWIGTYPE_p_wxStaticBitmap swig_types[35] -#define SWIGTYPE_p_wxSlider swig_types[36] -#define SWIGTYPE_p_wxStaticBox swig_types[37] -#define SWIGTYPE_p_wxArrayInt swig_types[38] -#define SWIGTYPE_p_wxContextHelp swig_types[39] -#define SWIGTYPE_p_long swig_types[40] -#define SWIGTYPE_p_wxEvtHandler swig_types[41] -#define SWIGTYPE_p_wxListEvent swig_types[42] -#define SWIGTYPE_p_wxListBox swig_types[43] -#define SWIGTYPE_p_wxCheckListBox swig_types[44] -#define SWIGTYPE_p_wxBookCtrl swig_types[45] -#define SWIGTYPE_p_wxSpinButton swig_types[46] -#define SWIGTYPE_p_wxButton swig_types[47] -#define SWIGTYPE_p_wxBitmapButton swig_types[48] -#define SWIGTYPE_p_wxRect swig_types[49] -#define SWIGTYPE_p_wxContextHelpButton swig_types[50] -#define SWIGTYPE_p_wxRadioBox swig_types[51] -#define SWIGTYPE_p_wxScrollBar swig_types[52] -#define SWIGTYPE_p_wxTreeItemId swig_types[53] -#define SWIGTYPE_p_wxComboBox swig_types[54] -#define SWIGTYPE_p_wxHelpEvent swig_types[55] -#define SWIGTYPE_p_wxListItem swig_types[56] -#define SWIGTYPE_p_wxNotebookSizer swig_types[57] -#define SWIGTYPE_p_wxSpinEvent swig_types[58] -#define SWIGTYPE_p_wxGenericDragImage swig_types[59] -#define SWIGTYPE_p_wxSpinCtrl swig_types[60] -#define SWIGTYPE_p_wxImageList swig_types[61] -#define SWIGTYPE_p_wxHelpProvider swig_types[62] -#define SWIGTYPE_p_wxTextAttr swig_types[63] -#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[64] -#define SWIGTYPE_p_wxPoint swig_types[65] -#define SWIGTYPE_p_wxListbookEvent swig_types[66] -#define SWIGTYPE_p_wxNotebookEvent swig_types[67] -#define SWIGTYPE_p_wxObject swig_types[68] -#define SWIGTYPE_p_wxCursor swig_types[69] -#define SWIGTYPE_p_wxKeyEvent swig_types[70] -#define SWIGTYPE_p_wxWindow swig_types[71] -#define SWIGTYPE_p_wxString swig_types[72] -#define SWIGTYPE_p_wxBitmap swig_types[73] -#define SWIGTYPE_p_wxTreeEvent swig_types[74] -#define SWIGTYPE_p_wxMouseEvent swig_types[75] -#define SWIGTYPE_p_wxCommandEvent swig_types[76] -#define SWIGTYPE_p_wxStaticText swig_types[77] -#define SWIGTYPE_p_wxControlWithItems swig_types[78] -#define SWIGTYPE_p_wxToolBarToolBase swig_types[79] -#define SWIGTYPE_p_wxColour swig_types[80] -#define SWIGTYPE_p_wxToolBar swig_types[81] -#define SWIGTYPE_p_wxBookCtrlSizer swig_types[82] -#define SWIGTYPE_p_wxValidator swig_types[83] -static swig_type_info *swig_types[85]; +#define SWIGTYPE_p_wxCheckBox swig_types[3] +#define SWIGTYPE_p_wxPyTreeCtrl swig_types[4] +#define SWIGTYPE_p_wxEvent swig_types[5] +#define SWIGTYPE_p_wxGenericDirCtrl swig_types[6] +#define SWIGTYPE_p_bool swig_types[7] +#define SWIGTYPE_p_wxPyTreeItemData swig_types[8] +#define SWIGTYPE_p_wxItemContainer swig_types[9] +#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[10] +#define SWIGTYPE_p_wxPyListCtrl swig_types[11] +#define SWIGTYPE_p_wxStaticLine swig_types[12] +#define SWIGTYPE_p_wxControl swig_types[13] +#define SWIGTYPE_p_wxPyControl swig_types[14] +#define SWIGTYPE_p_wxGauge swig_types[15] +#define SWIGTYPE_p_wxToolBarBase swig_types[16] +#define SWIGTYPE_p_wxFont swig_types[17] +#define SWIGTYPE_p_wxToggleButton swig_types[18] +#define SWIGTYPE_p_wxRadioButton swig_types[19] +#define SWIGTYPE_p_wxChoice swig_types[20] +#define SWIGTYPE_p_wxMemoryDC swig_types[21] +#define SWIGTYPE_p_wxListItemAttr swig_types[22] +#define SWIGTYPE_p_void swig_types[23] +#define SWIGTYPE_p_int swig_types[24] +#define SWIGTYPE_p_wxSize swig_types[25] +#define SWIGTYPE_p_wxDC swig_types[26] +#define SWIGTYPE_p_wxListView swig_types[27] +#define SWIGTYPE_p_wxIcon swig_types[28] +#define SWIGTYPE_p_wxTextCtrl swig_types[29] +#define SWIGTYPE_p_wxNotebook swig_types[30] +#define SWIGTYPE_p_wxNotifyEvent swig_types[31] +#define SWIGTYPE_p_wxArrayString swig_types[32] +#define SWIGTYPE_p_wxListbook swig_types[33] +#define SWIGTYPE_p_wxStaticBitmap swig_types[34] +#define SWIGTYPE_p_wxSlider swig_types[35] +#define SWIGTYPE_p_wxStaticBox swig_types[36] +#define SWIGTYPE_p_wxArrayInt swig_types[37] +#define SWIGTYPE_p_wxContextHelp swig_types[38] +#define SWIGTYPE_p_long swig_types[39] +#define SWIGTYPE_p_wxEvtHandler swig_types[40] +#define SWIGTYPE_p_wxListEvent swig_types[41] +#define SWIGTYPE_p_wxListBox swig_types[42] +#define SWIGTYPE_p_wxCheckListBox swig_types[43] +#define SWIGTYPE_p_wxBookCtrl swig_types[44] +#define SWIGTYPE_p_wxSpinButton swig_types[45] +#define SWIGTYPE_p_wxButton swig_types[46] +#define SWIGTYPE_p_wxBitmapButton swig_types[47] +#define SWIGTYPE_p_wxRect swig_types[48] +#define SWIGTYPE_p_wxContextHelpButton swig_types[49] +#define SWIGTYPE_p_wxRadioBox swig_types[50] +#define SWIGTYPE_p_wxScrollBar swig_types[51] +#define SWIGTYPE_p_wxTreeItemId swig_types[52] +#define SWIGTYPE_p_wxComboBox swig_types[53] +#define SWIGTYPE_p_wxHelpEvent swig_types[54] +#define SWIGTYPE_p_wxListItem swig_types[55] +#define SWIGTYPE_p_wxNotebookSizer swig_types[56] +#define SWIGTYPE_p_wxSpinEvent swig_types[57] +#define SWIGTYPE_p_wxGenericDragImage swig_types[58] +#define SWIGTYPE_p_wxSpinCtrl swig_types[59] +#define SWIGTYPE_p_wxImageList swig_types[60] +#define SWIGTYPE_p_wxHelpProvider swig_types[61] +#define SWIGTYPE_p_wxTextAttr swig_types[62] +#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[63] +#define SWIGTYPE_p_wxPoint swig_types[64] +#define SWIGTYPE_p_wxListbookEvent swig_types[65] +#define SWIGTYPE_p_wxNotebookEvent swig_types[66] +#define SWIGTYPE_p_wxObject swig_types[67] +#define SWIGTYPE_p_wxCursor swig_types[68] +#define SWIGTYPE_p_wxKeyEvent swig_types[69] +#define SWIGTYPE_p_wxWindow swig_types[70] +#define SWIGTYPE_p_wxString swig_types[71] +#define SWIGTYPE_p_wxBitmap swig_types[72] +#define SWIGTYPE_p_wxTreeEvent swig_types[73] +#define SWIGTYPE_p_wxMouseEvent swig_types[74] +#define SWIGTYPE_p_wxCommandEvent swig_types[75] +#define SWIGTYPE_p_wxStaticText swig_types[76] +#define SWIGTYPE_p_wxControlWithItems swig_types[77] +#define SWIGTYPE_p_wxToolBarToolBase swig_types[78] +#define SWIGTYPE_p_wxColour swig_types[79] +#define SWIGTYPE_p_wxToolBar swig_types[80] +#define SWIGTYPE_p_wxBookCtrlSizer swig_types[81] +#define SWIGTYPE_p_wxValidator swig_types[82] +static swig_type_info *swig_types[84]; /* -------- TYPES TABLE (END) -------- */ @@ -828,21 +827,21 @@ PyObject *wxPyTreeCtrl_GetSelections(wxPyTreeCtrl *self){ return rval; } PyObject *wxPyTreeCtrl_GetFirstChild(wxPyTreeCtrl *self,wxTreeItemId const &item){ - wxTreeItemIdValue cookie = 0; - wxTreeItemId ritem = self->GetFirstChild(item, cookie); + void* cookie = 0; + wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie)); wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True)); - PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True)); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); wxPyEndBlockThreads(); return tup; } -PyObject *wxPyTreeCtrl_GetNextChild(wxPyTreeCtrl *self,wxTreeItemId const &item,wxTreeItemIdValue &cookie){ - wxTreeItemId ritem = self->GetNextChild(item, cookie); +PyObject *wxPyTreeCtrl_GetNextChild(wxPyTreeCtrl *self,wxTreeItemId const &item,void *cookie){ + wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie)); wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True)); - PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True)); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); wxPyEndBlockThreads(); return tup; } @@ -11639,7 +11638,7 @@ static PyObject *_wrap_BookCtrl_AssignImageList(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_AssignImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2); @@ -18946,7 +18945,7 @@ static PyObject *_wrap_ListCtrl_AssignImageList(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:ListCtrl_AssignImageList",kwnames,&obj0,&obj1,&arg3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2,arg3); @@ -20390,7 +20389,7 @@ static PyObject *_wrap_TreeItemId___ne__(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_TreeItemId_m_pItem_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTreeItemId *arg1 = (wxTreeItemId *) 0 ; - wxTreeItemIdValue arg2 = (wxTreeItemIdValue) 0 ; + void *arg2 = (void *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -20412,7 +20411,7 @@ static PyObject *_wrap_TreeItemId_m_pItem_set(PyObject *self, PyObject *args, Py static PyObject *_wrap_TreeItemId_m_pItem_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTreeItemId *arg1 = (wxTreeItemId *) 0 ; - wxTreeItemIdValue result; + void *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -20420,9 +20419,9 @@ static PyObject *_wrap_TreeItemId_m_pItem_get(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TreeItemId_m_pItem_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxTreeItemIdValue) ((arg1)->m_pItem); + result = (void *) ((arg1)->m_pItem); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_wxTreeItemIdValue, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_void, 0); return resultobj; fail: return NULL; @@ -21529,7 +21528,7 @@ static PyObject *_wrap_TreeCtrl_AssignImageList(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_AssignImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2); @@ -21556,7 +21555,7 @@ static PyObject *_wrap_TreeCtrl_AssignStateImageList(PyObject *self, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_AssignStateImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignStateImageList(arg2); @@ -22484,7 +22483,7 @@ static PyObject *_wrap_TreeCtrl_GetNextChild(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxTreeItemIdValue *arg3 = 0 ; + void *arg3 = (void *) 0 ; PyObject *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -22499,13 +22498,10 @@ static PyObject *_wrap_TreeCtrl_GetNextChild(PyObject *self, PyObject *args, PyO if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxTreeItemIdValue,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg3 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + if ((SWIG_ConvertPtr(obj2,(void **) &arg3, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxPyTreeCtrl_GetNextChild(arg1,(wxTreeItemId const &)*arg2,*arg3); + result = (PyObject *)wxPyTreeCtrl_GetNextChild(arg1,(wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -28227,8 +28223,6 @@ static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { static swig_type_info _swigt__p_wxTextUrlEvent[] = {{"_p_wxTextUrlEvent", 0, "wxTextUrlEvent *", 0},{"_p_wxTextUrlEvent"},{0}}; static swig_type_info _swigt__p_wxBookCtrlEvent[] = {{"_p_wxBookCtrlEvent", 0, "wxBookCtrlEvent *", 0},{"_p_wxBookCtrlEvent"},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxBookCtrlEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxBookCtrlEvent},{0}}; static swig_type_info _swigt__p_wxSizer[] = {{"_p_wxSizer", 0, "wxSizer *", 0},{"_p_wxSizer"},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxSizer},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxSizer},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxSizer},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxSizer},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxSizer},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxSizer},{"_p_wxPySizer", _p_wxPySizerTo_p_wxSizer},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxSizer},{0}}; -static swig_type_info _swigt__p_wxTreeItemIdValue[] = {{"_p_wxTreeItemIdValue", 0, "wxTreeItemIdValue *", 0},{"_p_wxTreeItemIdValue"},{0}}; -static swig_type_info _swigt__wxTreeItemIdValue[] = {{"_wxTreeItemIdValue", 0, "wxTreeItemIdValue", 0},{"_wxTreeItemIdValue"},{0}}; static swig_type_info _swigt__p_wxCheckBox[] = {{"_p_wxCheckBox", 0, "wxCheckBox *", 0},{"_p_wxCheckBox"},{0}}; static swig_type_info _swigt__p_wxPyTreeCtrl[] = {{"_p_wxPyTreeCtrl", 0, "wxPyTreeCtrl *", 0},{"_p_wxPyTreeCtrl"},{0}}; static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxEvent},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxListEvent", _p_wxListEventTo_p_wxEvent},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxEvent},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxEvent},{"_p_wxEvent"},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{0}}; @@ -28249,6 +28243,7 @@ static swig_type_info _swigt__p_wxRadioButton[] = {{"_p_wxRadioButton", 0, "wxRa static swig_type_info _swigt__p_wxChoice[] = {{"_p_wxChoice", 0, "wxChoice *", 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxChoice},{"_p_wxChoice"},{0}}; static swig_type_info _swigt__p_wxMemoryDC[] = {{"_p_wxMemoryDC", 0, "wxMemoryDC *", 0},{"_p_wxMemoryDC"},{0}}; static swig_type_info _swigt__p_wxListItemAttr[] = {{"_p_wxListItemAttr", 0, "wxListItemAttr *", 0},{"_p_wxListItemAttr"},{0}}; +static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0},{"_p_void"},{0}}; static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}}; static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0},{"_p_wxSize"},{0}}; static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"},{0}}; @@ -28313,8 +28308,6 @@ static swig_type_info *swig_types_initial[] = { _swigt__p_wxTextUrlEvent, _swigt__p_wxBookCtrlEvent, _swigt__p_wxSizer, -_swigt__p_wxTreeItemIdValue, -_swigt__wxTreeItemIdValue, _swigt__p_wxCheckBox, _swigt__p_wxPyTreeCtrl, _swigt__p_wxEvent, @@ -28335,6 +28328,7 @@ _swigt__p_wxRadioButton, _swigt__p_wxChoice, _swigt__p_wxMemoryDC, _swigt__p_wxListItemAttr, +_swigt__p_void, _swigt__p_int, _swigt__p_wxSize, _swigt__p_wxDC, diff --git a/wxPython/src/mac/core.py b/wxPython/src/mac/core.py index 34fde12ac2..7a2f487c31 100644 --- a/wxPython/src/mac/core.py +++ b/wxPython/src/mac/core.py @@ -6007,9 +6007,7 @@ class Window(EvtHandler): def SetDropTarget(*args, **kwargs): """SetDropTarget(PyDropTarget dropTarget)""" - val = _core.Window_SetDropTarget(*args, **kwargs) - args[1].thisown = 0 - return val + return _core.Window_SetDropTarget(*args, **kwargs) def GetDropTarget(*args, **kwargs): """GetDropTarget() -> PyDropTarget""" diff --git a/wxPython/src/mac/core_wrap.cpp b/wxPython/src/mac/core_wrap.cpp index 3684f47fe6..988bc1f04f 100644 --- a/wxPython/src/mac/core_wrap.cpp +++ b/wxPython/src/mac/core_wrap.cpp @@ -24498,7 +24498,7 @@ static PyObject *_wrap_Window_SetDropTarget(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDropTarget",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDropTarget(arg2); diff --git a/wxPython/src/mac/misc.py b/wxPython/src/mac/misc.py index baef1315cb..a1b704a01d 100644 --- a/wxPython/src/mac/misc.py +++ b/wxPython/src/mac/misc.py @@ -4131,9 +4131,7 @@ class DataObjectComposite(DataObject): del newobj.thisown def Add(*args, **kwargs): """Add(DataObjectSimple dataObject, int preferred=False)""" - val = _misc.DataObjectComposite_Add(*args, **kwargs) - args[1].thisown = 0 - return val + return _misc.DataObjectComposite_Add(*args, **kwargs) class DataObjectCompositePtr(DataObjectComposite): @@ -4421,7 +4419,6 @@ class DropTarget(object): self.this = newobj.this self.thisown = 1 del newobj.thisown - if args: args[0].thisown = 0; self._setCallbackInfo(self, DropTarget) def _setCallbackInfo(*args, **kwargs): @@ -4440,9 +4437,7 @@ class DropTarget(object): def SetDataObject(*args, **kwargs): """SetDataObject(DataObject dataObject)""" - val = _misc.DropTarget_SetDataObject(*args, **kwargs) - args[1].thisown = 0 - return val + return _misc.DropTarget_SetDataObject(*args, **kwargs) def base_OnEnter(*args, **kwargs): """base_OnEnter(int x, int y, int def) -> int""" diff --git a/wxPython/src/mac/misc_wrap.cpp b/wxPython/src/mac/misc_wrap.cpp index c49a479ee6..14743d083e 100644 --- a/wxPython/src/mac/misc_wrap.cpp +++ b/wxPython/src/mac/misc_wrap.cpp @@ -22769,7 +22769,7 @@ static PyObject *_wrap_DataObjectComposite_Add(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:DataObjectComposite_Add",kwnames,&obj0,&obj1,&arg3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObjectComposite,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObjectSimple,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObjectSimple,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Add(arg2,arg3); @@ -23854,7 +23854,7 @@ static PyObject *_wrap_new_PyDropTarget(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyDropTarget",kwnames,&obj0)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23961,7 +23961,7 @@ static PyObject *_wrap_DropTarget_SetDataObject(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DropTarget_SetDataObject",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDataObject(arg2); @@ -24636,7 +24636,7 @@ static PyObject *_wrap_Clipboard_AddData(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Clipboard_AddData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxClipboard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->AddData(arg2); @@ -24664,7 +24664,7 @@ static PyObject *_wrap_Clipboard_SetData(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Clipboard_SetData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxClipboard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetData(arg2); diff --git a/wxPython/src/msw/calendar_wrap.cpp b/wxPython/src/msw/calendar_wrap.cpp index a07bde18ce..61ae12a89f 100644 --- a/wxPython/src/msw/calendar_wrap.cpp +++ b/wxPython/src/msw/calendar_wrap.cpp @@ -1013,7 +1013,7 @@ static PyObject *_wrap_new_CalendarEvent(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_CalendarEvent_GetDate(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ; - wxDateTime *result; + wxDateTime result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -1023,15 +1023,16 @@ static PyObject *_wrap_CalendarEvent_GetDate(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxDateTime const &_result_ref = ((wxCalendarEvent const *)arg1)->GetDate(); - result = (wxDateTime *) &_result_ref; - } + result = ((wxCalendarEvent const *)arg1)->GetDate(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxDateTime, 0); + { + wxDateTime * resultptr; + resultptr = new wxDateTime((wxDateTime &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxDateTime, 1); + } return resultobj; fail: return NULL; diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py index 409663dbfd..8fad8ee7be 100644 --- a/wxPython/src/msw/controls.py +++ b/wxPython/src/msw/controls.py @@ -1942,9 +1942,7 @@ class BookCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList)""" - val = _controls.BookCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.BookCtrl_AssignImageList(*args, **kwargs) def GetImageList(*args, **kwargs): """GetImageList() -> ImageList""" @@ -3403,9 +3401,7 @@ class ListCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList, int which)""" - val = _controls.ListCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.ListCtrl_AssignImageList(*args, **kwargs) def IsVirtual(*args, **kwargs): """IsVirtual() -> bool""" @@ -3979,15 +3975,11 @@ class TreeCtrl(core.Control): def AssignImageList(*args, **kwargs): """AssignImageList(ImageList imageList)""" - val = _controls.TreeCtrl_AssignImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.TreeCtrl_AssignImageList(*args, **kwargs) def AssignStateImageList(*args, **kwargs): """AssignStateImageList(ImageList imageList)""" - val = _controls.TreeCtrl_AssignStateImageList(*args, **kwargs) - args[1].thisown = 0 - return val + return _controls.TreeCtrl_AssignStateImageList(*args, **kwargs) def GetItemText(*args, **kwargs): """GetItemText(TreeItemId item) -> String""" @@ -4104,7 +4096,7 @@ class TreeCtrl(core.Control): return _controls.TreeCtrl_GetFirstChild(*args, **kwargs) def GetNextChild(*args, **kwargs): - """GetNextChild(TreeItemId item, wxTreeItemIdValue cookie) -> PyObject""" + """GetNextChild(TreeItemId item, void cookie) -> PyObject""" return _controls.TreeCtrl_GetNextChild(*args, **kwargs) def GetLastChild(*args, **kwargs): diff --git a/wxPython/src/msw/controls_wrap.cpp b/wxPython/src/msw/controls_wrap.cpp index 8c0702f49a..8b3587b53c 100644 --- a/wxPython/src/msw/controls_wrap.cpp +++ b/wxPython/src/msw/controls_wrap.cpp @@ -384,88 +384,87 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxTextUrlEvent swig_types[0] #define SWIGTYPE_p_wxBookCtrlEvent swig_types[1] #define SWIGTYPE_p_wxSizer swig_types[2] -#define SWIGTYPE_p_wxTreeItemIdValue swig_types[3] -#define SWIGTYPE_wxTreeItemIdValue swig_types[4] -#define SWIGTYPE_p_wxCheckBox swig_types[5] -#define SWIGTYPE_p_wxPyTreeCtrl swig_types[6] -#define SWIGTYPE_p_wxEvent swig_types[7] -#define SWIGTYPE_p_wxGenericDirCtrl swig_types[8] -#define SWIGTYPE_p_bool swig_types[9] -#define SWIGTYPE_p_wxPyTreeItemData swig_types[10] -#define SWIGTYPE_p_wxItemContainer swig_types[11] -#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[12] -#define SWIGTYPE_p_wxPyListCtrl swig_types[13] -#define SWIGTYPE_p_wxStaticLine swig_types[14] -#define SWIGTYPE_p_wxControl swig_types[15] -#define SWIGTYPE_p_wxPyControl swig_types[16] -#define SWIGTYPE_p_wxGauge swig_types[17] -#define SWIGTYPE_p_wxToolBarBase swig_types[18] -#define SWIGTYPE_p_wxFont swig_types[19] -#define SWIGTYPE_p_wxToggleButton swig_types[20] -#define SWIGTYPE_p_wxRadioButton swig_types[21] -#define SWIGTYPE_p_wxChoice swig_types[22] -#define SWIGTYPE_p_wxMemoryDC swig_types[23] -#define SWIGTYPE_p_wxListItemAttr swig_types[24] -#define SWIGTYPE_p_int swig_types[25] -#define SWIGTYPE_p_wxSize swig_types[26] -#define SWIGTYPE_p_wxDC swig_types[27] -#define SWIGTYPE_p_wxListView swig_types[28] -#define SWIGTYPE_p_wxIcon swig_types[29] -#define SWIGTYPE_p_wxTextCtrl swig_types[30] -#define SWIGTYPE_p_wxNotebook swig_types[31] -#define SWIGTYPE_p_wxNotifyEvent swig_types[32] -#define SWIGTYPE_p_wxArrayString swig_types[33] -#define SWIGTYPE_p_wxListbook swig_types[34] -#define SWIGTYPE_p_wxStaticBitmap swig_types[35] -#define SWIGTYPE_p_wxSlider swig_types[36] -#define SWIGTYPE_p_wxStaticBox swig_types[37] -#define SWIGTYPE_p_wxArrayInt swig_types[38] -#define SWIGTYPE_p_wxContextHelp swig_types[39] -#define SWIGTYPE_p_long swig_types[40] -#define SWIGTYPE_p_wxEvtHandler swig_types[41] -#define SWIGTYPE_p_wxListEvent swig_types[42] -#define SWIGTYPE_p_wxListBox swig_types[43] -#define SWIGTYPE_p_wxCheckListBox swig_types[44] -#define SWIGTYPE_p_wxBookCtrl swig_types[45] -#define SWIGTYPE_p_wxSpinButton swig_types[46] -#define SWIGTYPE_p_wxButton swig_types[47] -#define SWIGTYPE_p_wxBitmapButton swig_types[48] -#define SWIGTYPE_p_wxRect swig_types[49] -#define SWIGTYPE_p_wxContextHelpButton swig_types[50] -#define SWIGTYPE_p_wxRadioBox swig_types[51] -#define SWIGTYPE_p_wxScrollBar swig_types[52] -#define SWIGTYPE_p_wxTreeItemId swig_types[53] -#define SWIGTYPE_p_wxComboBox swig_types[54] -#define SWIGTYPE_p_wxHelpEvent swig_types[55] -#define SWIGTYPE_p_wxListItem swig_types[56] -#define SWIGTYPE_p_wxNotebookSizer swig_types[57] -#define SWIGTYPE_p_wxSpinEvent swig_types[58] -#define SWIGTYPE_p_wxGenericDragImage swig_types[59] -#define SWIGTYPE_p_wxSpinCtrl swig_types[60] -#define SWIGTYPE_p_wxImageList swig_types[61] -#define SWIGTYPE_p_wxHelpProvider swig_types[62] -#define SWIGTYPE_p_wxTextAttr swig_types[63] -#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[64] -#define SWIGTYPE_p_wxPoint swig_types[65] -#define SWIGTYPE_p_wxListbookEvent swig_types[66] -#define SWIGTYPE_p_wxNotebookEvent swig_types[67] -#define SWIGTYPE_p_wxObject swig_types[68] -#define SWIGTYPE_p_wxCursor swig_types[69] -#define SWIGTYPE_p_wxKeyEvent swig_types[70] -#define SWIGTYPE_p_wxWindow swig_types[71] -#define SWIGTYPE_p_wxString swig_types[72] -#define SWIGTYPE_p_wxBitmap swig_types[73] -#define SWIGTYPE_p_wxTreeEvent swig_types[74] -#define SWIGTYPE_p_wxMouseEvent swig_types[75] -#define SWIGTYPE_p_wxCommandEvent swig_types[76] -#define SWIGTYPE_p_wxStaticText swig_types[77] -#define SWIGTYPE_p_wxControlWithItems swig_types[78] -#define SWIGTYPE_p_wxToolBarToolBase swig_types[79] -#define SWIGTYPE_p_wxColour swig_types[80] -#define SWIGTYPE_p_wxToolBar swig_types[81] -#define SWIGTYPE_p_wxBookCtrlSizer swig_types[82] -#define SWIGTYPE_p_wxValidator swig_types[83] -static swig_type_info *swig_types[85]; +#define SWIGTYPE_p_wxCheckBox swig_types[3] +#define SWIGTYPE_p_wxPyTreeCtrl swig_types[4] +#define SWIGTYPE_p_wxEvent swig_types[5] +#define SWIGTYPE_p_wxGenericDirCtrl swig_types[6] +#define SWIGTYPE_p_bool swig_types[7] +#define SWIGTYPE_p_wxPyTreeItemData swig_types[8] +#define SWIGTYPE_p_wxItemContainer swig_types[9] +#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[10] +#define SWIGTYPE_p_wxPyListCtrl swig_types[11] +#define SWIGTYPE_p_wxStaticLine swig_types[12] +#define SWIGTYPE_p_wxControl swig_types[13] +#define SWIGTYPE_p_wxPyControl swig_types[14] +#define SWIGTYPE_p_wxGauge swig_types[15] +#define SWIGTYPE_p_wxToolBarBase swig_types[16] +#define SWIGTYPE_p_wxFont swig_types[17] +#define SWIGTYPE_p_wxToggleButton swig_types[18] +#define SWIGTYPE_p_wxRadioButton swig_types[19] +#define SWIGTYPE_p_wxChoice swig_types[20] +#define SWIGTYPE_p_wxMemoryDC swig_types[21] +#define SWIGTYPE_p_wxListItemAttr swig_types[22] +#define SWIGTYPE_p_void swig_types[23] +#define SWIGTYPE_p_int swig_types[24] +#define SWIGTYPE_p_wxSize swig_types[25] +#define SWIGTYPE_p_wxDC swig_types[26] +#define SWIGTYPE_p_wxListView swig_types[27] +#define SWIGTYPE_p_wxIcon swig_types[28] +#define SWIGTYPE_p_wxTextCtrl swig_types[29] +#define SWIGTYPE_p_wxNotebook swig_types[30] +#define SWIGTYPE_p_wxNotifyEvent swig_types[31] +#define SWIGTYPE_p_wxArrayString swig_types[32] +#define SWIGTYPE_p_wxListbook swig_types[33] +#define SWIGTYPE_p_wxStaticBitmap swig_types[34] +#define SWIGTYPE_p_wxSlider swig_types[35] +#define SWIGTYPE_p_wxStaticBox swig_types[36] +#define SWIGTYPE_p_wxArrayInt swig_types[37] +#define SWIGTYPE_p_wxContextHelp swig_types[38] +#define SWIGTYPE_p_long swig_types[39] +#define SWIGTYPE_p_wxEvtHandler swig_types[40] +#define SWIGTYPE_p_wxListEvent swig_types[41] +#define SWIGTYPE_p_wxListBox swig_types[42] +#define SWIGTYPE_p_wxCheckListBox swig_types[43] +#define SWIGTYPE_p_wxBookCtrl swig_types[44] +#define SWIGTYPE_p_wxSpinButton swig_types[45] +#define SWIGTYPE_p_wxButton swig_types[46] +#define SWIGTYPE_p_wxBitmapButton swig_types[47] +#define SWIGTYPE_p_wxRect swig_types[48] +#define SWIGTYPE_p_wxContextHelpButton swig_types[49] +#define SWIGTYPE_p_wxRadioBox swig_types[50] +#define SWIGTYPE_p_wxScrollBar swig_types[51] +#define SWIGTYPE_p_wxTreeItemId swig_types[52] +#define SWIGTYPE_p_wxComboBox swig_types[53] +#define SWIGTYPE_p_wxHelpEvent swig_types[54] +#define SWIGTYPE_p_wxListItem swig_types[55] +#define SWIGTYPE_p_wxNotebookSizer swig_types[56] +#define SWIGTYPE_p_wxSpinEvent swig_types[57] +#define SWIGTYPE_p_wxGenericDragImage swig_types[58] +#define SWIGTYPE_p_wxSpinCtrl swig_types[59] +#define SWIGTYPE_p_wxImageList swig_types[60] +#define SWIGTYPE_p_wxHelpProvider swig_types[61] +#define SWIGTYPE_p_wxTextAttr swig_types[62] +#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[63] +#define SWIGTYPE_p_wxPoint swig_types[64] +#define SWIGTYPE_p_wxListbookEvent swig_types[65] +#define SWIGTYPE_p_wxNotebookEvent swig_types[66] +#define SWIGTYPE_p_wxObject swig_types[67] +#define SWIGTYPE_p_wxCursor swig_types[68] +#define SWIGTYPE_p_wxKeyEvent swig_types[69] +#define SWIGTYPE_p_wxWindow swig_types[70] +#define SWIGTYPE_p_wxString swig_types[71] +#define SWIGTYPE_p_wxBitmap swig_types[72] +#define SWIGTYPE_p_wxTreeEvent swig_types[73] +#define SWIGTYPE_p_wxMouseEvent swig_types[74] +#define SWIGTYPE_p_wxCommandEvent swig_types[75] +#define SWIGTYPE_p_wxStaticText swig_types[76] +#define SWIGTYPE_p_wxControlWithItems swig_types[77] +#define SWIGTYPE_p_wxToolBarToolBase swig_types[78] +#define SWIGTYPE_p_wxColour swig_types[79] +#define SWIGTYPE_p_wxToolBar swig_types[80] +#define SWIGTYPE_p_wxBookCtrlSizer swig_types[81] +#define SWIGTYPE_p_wxValidator swig_types[82] +static swig_type_info *swig_types[84]; /* -------- TYPES TABLE (END) -------- */ @@ -828,21 +827,21 @@ PyObject *wxPyTreeCtrl_GetSelections(wxPyTreeCtrl *self){ return rval; } PyObject *wxPyTreeCtrl_GetFirstChild(wxPyTreeCtrl *self,wxTreeItemId const &item){ - wxTreeItemIdValue cookie = 0; - wxTreeItemId ritem = self->GetFirstChild(item, cookie); + void* cookie = 0; + wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie)); wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True)); - PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True)); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); wxPyEndBlockThreads(); return tup; } -PyObject *wxPyTreeCtrl_GetNextChild(wxPyTreeCtrl *self,wxTreeItemId const &item,wxTreeItemIdValue &cookie){ - wxTreeItemId ritem = self->GetNextChild(item, cookie); +PyObject *wxPyTreeCtrl_GetNextChild(wxPyTreeCtrl *self,wxTreeItemId const &item,void *cookie){ + wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie)); wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True)); - PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True)); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); wxPyEndBlockThreads(); return tup; } @@ -11967,7 +11966,7 @@ static PyObject *_wrap_BookCtrl_AssignImageList(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_AssignImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2); @@ -19302,7 +19301,7 @@ static PyObject *_wrap_ListCtrl_AssignImageList(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:ListCtrl_AssignImageList",kwnames,&obj0,&obj1,&arg3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2,arg3); @@ -20780,7 +20779,7 @@ static PyObject *_wrap_TreeItemId___ne__(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_TreeItemId_m_pItem_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTreeItemId *arg1 = (wxTreeItemId *) 0 ; - wxTreeItemIdValue arg2 = (wxTreeItemIdValue) 0 ; + void *arg2 = (void *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -20802,7 +20801,7 @@ static PyObject *_wrap_TreeItemId_m_pItem_set(PyObject *self, PyObject *args, Py static PyObject *_wrap_TreeItemId_m_pItem_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTreeItemId *arg1 = (wxTreeItemId *) 0 ; - wxTreeItemIdValue result; + void *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -20810,9 +20809,9 @@ static PyObject *_wrap_TreeItemId_m_pItem_get(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TreeItemId_m_pItem_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxTreeItemIdValue) ((arg1)->m_pItem); + result = (void *) ((arg1)->m_pItem); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_wxTreeItemIdValue, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_void, 0); return resultobj; fail: return NULL; @@ -21919,7 +21918,7 @@ static PyObject *_wrap_TreeCtrl_AssignImageList(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_AssignImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2); @@ -21946,7 +21945,7 @@ static PyObject *_wrap_TreeCtrl_AssignStateImageList(PyObject *self, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_AssignStateImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignStateImageList(arg2); @@ -22912,7 +22911,7 @@ static PyObject *_wrap_TreeCtrl_GetNextChild(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxTreeItemIdValue *arg3 = 0 ; + void *arg3 = (void *) 0 ; PyObject *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -22927,13 +22926,10 @@ static PyObject *_wrap_TreeCtrl_GetNextChild(PyObject *self, PyObject *args, PyO if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxTreeItemIdValue,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg3 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + if ((SWIG_ConvertPtr(obj2,(void **) &arg3, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxPyTreeCtrl_GetNextChild(arg1,(wxTreeItemId const &)*arg2,*arg3); + result = (PyObject *)wxPyTreeCtrl_GetNextChild(arg1,(wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -28712,8 +28708,6 @@ static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { static swig_type_info _swigt__p_wxTextUrlEvent[] = {{"_p_wxTextUrlEvent", 0, "wxTextUrlEvent *", 0},{"_p_wxTextUrlEvent"},{0}}; static swig_type_info _swigt__p_wxBookCtrlEvent[] = {{"_p_wxBookCtrlEvent", 0, "wxBookCtrlEvent *", 0},{"_p_wxBookCtrlEvent"},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxBookCtrlEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxBookCtrlEvent},{0}}; static swig_type_info _swigt__p_wxSizer[] = {{"_p_wxSizer", 0, "wxSizer *", 0},{"_p_wxSizer"},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxSizer},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxSizer},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxSizer},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxSizer},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxSizer},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxSizer},{"_p_wxPySizer", _p_wxPySizerTo_p_wxSizer},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxSizer},{0}}; -static swig_type_info _swigt__p_wxTreeItemIdValue[] = {{"_p_wxTreeItemIdValue", 0, "wxTreeItemIdValue *", 0},{"_p_wxTreeItemIdValue"},{0}}; -static swig_type_info _swigt__wxTreeItemIdValue[] = {{"_wxTreeItemIdValue", 0, "wxTreeItemIdValue", 0},{"_wxTreeItemIdValue"},{0}}; static swig_type_info _swigt__p_wxCheckBox[] = {{"_p_wxCheckBox", 0, "wxCheckBox *", 0},{"_p_wxCheckBox"},{0}}; static swig_type_info _swigt__p_wxPyTreeCtrl[] = {{"_p_wxPyTreeCtrl", 0, "wxPyTreeCtrl *", 0},{"_p_wxPyTreeCtrl"},{0}}; static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxEvent},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxListEvent", _p_wxListEventTo_p_wxEvent},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxEvent},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxEvent},{"_p_wxEvent"},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{0}}; @@ -28734,6 +28728,7 @@ static swig_type_info _swigt__p_wxRadioButton[] = {{"_p_wxRadioButton", 0, "wxRa static swig_type_info _swigt__p_wxChoice[] = {{"_p_wxChoice", 0, "wxChoice *", 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxChoice},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxChoice},{"_p_wxChoice"},{0}}; static swig_type_info _swigt__p_wxMemoryDC[] = {{"_p_wxMemoryDC", 0, "wxMemoryDC *", 0},{"_p_wxMemoryDC"},{0}}; static swig_type_info _swigt__p_wxListItemAttr[] = {{"_p_wxListItemAttr", 0, "wxListItemAttr *", 0},{"_p_wxListItemAttr"},{0}}; +static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0},{"_p_void"},{0}}; static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}}; static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0},{"_p_wxSize"},{0}}; static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"},{0}}; @@ -28798,8 +28793,6 @@ static swig_type_info *swig_types_initial[] = { _swigt__p_wxTextUrlEvent, _swigt__p_wxBookCtrlEvent, _swigt__p_wxSizer, -_swigt__p_wxTreeItemIdValue, -_swigt__wxTreeItemIdValue, _swigt__p_wxCheckBox, _swigt__p_wxPyTreeCtrl, _swigt__p_wxEvent, @@ -28820,6 +28813,7 @@ _swigt__p_wxRadioButton, _swigt__p_wxChoice, _swigt__p_wxMemoryDC, _swigt__p_wxListItemAttr, +_swigt__p_void, _swigt__p_int, _swigt__p_wxSize, _swigt__p_wxDC, diff --git a/wxPython/src/msw/core.py b/wxPython/src/msw/core.py index 58db98ba84..3cb44c5789 100644 --- a/wxPython/src/msw/core.py +++ b/wxPython/src/msw/core.py @@ -6011,9 +6011,7 @@ class Window(EvtHandler): def SetDropTarget(*args, **kwargs): """SetDropTarget(PyDropTarget dropTarget)""" - val = _core.Window_SetDropTarget(*args, **kwargs) - args[1].thisown = 0 - return val + return _core.Window_SetDropTarget(*args, **kwargs) def GetDropTarget(*args, **kwargs): """GetDropTarget() -> PyDropTarget""" diff --git a/wxPython/src/msw/core_wrap.cpp b/wxPython/src/msw/core_wrap.cpp index ee1dd0a3cb..3dceb1598f 100644 --- a/wxPython/src/msw/core_wrap.cpp +++ b/wxPython/src/msw/core_wrap.cpp @@ -24526,7 +24526,7 @@ static PyObject *_wrap_Window_SetDropTarget(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDropTarget",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDropTarget(arg2); diff --git a/wxPython/src/msw/misc.py b/wxPython/src/msw/misc.py index ba361c577d..e08d0359e0 100644 --- a/wxPython/src/msw/misc.py +++ b/wxPython/src/msw/misc.py @@ -4131,9 +4131,7 @@ class DataObjectComposite(DataObject): del newobj.thisown def Add(*args, **kwargs): """Add(DataObjectSimple dataObject, int preferred=False)""" - val = _misc.DataObjectComposite_Add(*args, **kwargs) - args[1].thisown = 0 - return val + return _misc.DataObjectComposite_Add(*args, **kwargs) class DataObjectCompositePtr(DataObjectComposite): @@ -4425,7 +4423,6 @@ class DropTarget(object): self.this = newobj.this self.thisown = 1 del newobj.thisown - if args: args[0].thisown = 0; self._setCallbackInfo(self, DropTarget) def _setCallbackInfo(*args, **kwargs): @@ -4444,9 +4441,7 @@ class DropTarget(object): def SetDataObject(*args, **kwargs): """SetDataObject(DataObject dataObject)""" - val = _misc.DropTarget_SetDataObject(*args, **kwargs) - args[1].thisown = 0 - return val + return _misc.DropTarget_SetDataObject(*args, **kwargs) def base_OnEnter(*args, **kwargs): """base_OnEnter(int x, int y, int def) -> int""" diff --git a/wxPython/src/msw/misc_wrap.cpp b/wxPython/src/msw/misc_wrap.cpp index 16c7bde4b7..4df2e639c1 100644 --- a/wxPython/src/msw/misc_wrap.cpp +++ b/wxPython/src/msw/misc_wrap.cpp @@ -22769,7 +22769,7 @@ static PyObject *_wrap_DataObjectComposite_Add(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:DataObjectComposite_Add",kwnames,&obj0,&obj1,&arg3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObjectComposite,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObjectSimple,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObjectSimple,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Add(arg2,arg3); @@ -23894,7 +23894,7 @@ static PyObject *_wrap_new_PyDropTarget(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyDropTarget",kwnames,&obj0)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24001,7 +24001,7 @@ static PyObject *_wrap_DropTarget_SetDataObject(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DropTarget_SetDataObject",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDataObject(arg2); @@ -24676,7 +24676,7 @@ static PyObject *_wrap_Clipboard_AddData(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Clipboard_AddData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxClipboard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->AddData(arg2); @@ -24704,7 +24704,7 @@ static PyObject *_wrap_Clipboard_SetData(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Clipboard_SetData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxClipboard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetData(arg2); -- 2.45.2