X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6260902deed6ab165030edce802b95905958f10a..a8cb1a4947bbbf5e18ce52448f4c3bb4cff4daee:/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp?ds=sidebyside diff --git a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp index 7f57da209b..8a54bffbe5 100644 --- a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp @@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj) PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received", type, otype); } - Py_DECREF(str); + if (str) + Py_DECREF(str); return; } } @@ -2521,15 +2522,11 @@ static PyObject *_wrap_EditableListBox_SetStrings(PyObject *, PyObject *args, Py int i, len=PySequence_Length(obj1); for (i=0; iAdd(Py2wxString(str)); + arg2->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } { @@ -8139,8 +8136,9 @@ static PyObject * TreeListCtrl_swigregister(PyObject *, PyObject *args) { static PyObject *_wrap_new_StaticPicture(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - int arg2 ; - wxBitmap *arg3 = 0 ; + int arg2 = (int) -1 ; + wxBitmap const &arg3_defvalue = wxNullBitmap ; + wxBitmap *arg3 = (wxBitmap *) &arg3_defvalue ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -8163,20 +8161,24 @@ static PyObject *_wrap_new_StaticPicture(PyObject *, PyObject *args, PyObject *k (char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_StaticPicture",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_StaticPicture",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (int)(SWIG_As_int(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; + if (obj1) { + { + arg2 = (int)(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } } - { - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(3)) SWIG_fail; - if (arg3 == NULL) { - SWIG_null_ref("wxBitmap"); + if (obj2) { + { + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(3)) SWIG_fail; + if (arg3 == NULL) { + SWIG_null_ref("wxBitmap"); + } + if (SWIG_arg_fail(3)) SWIG_fail; } - if (SWIG_arg_fail(3)) SWIG_fail; } if (obj3) { { @@ -8253,8 +8255,9 @@ static PyObject *_wrap_StaticPicture_Create(PyObject *, PyObject *args, PyObject PyObject *resultobj; wxStaticPicture *arg1 = (wxStaticPicture *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - int arg3 ; - wxBitmap *arg4 = 0 ; + int arg3 = (int) -1 ; + wxBitmap const &arg4_defvalue = wxNullBitmap ; + wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ; wxPoint const &arg5_defvalue = wxDefaultPosition ; wxPoint *arg5 = (wxPoint *) &arg5_defvalue ; wxSize const &arg6_defvalue = wxDefaultSize ; @@ -8278,22 +8281,26 @@ static PyObject *_wrap_StaticPicture_Create(PyObject *, PyObject *args, PyObject (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:StaticPicture_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:StaticPicture_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStaticPicture, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; - { - arg3 = (int)(SWIG_As_int(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; + if (obj2) { + { + arg3 = (int)(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } } - { - SWIG_Python_ConvertPtr(obj3, (void **)&arg4, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(4)) SWIG_fail; - if (arg4 == NULL) { - SWIG_null_ref("wxBitmap"); + if (obj3) { + { + SWIG_Python_ConvertPtr(obj3, (void **)&arg4, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(4)) SWIG_fail; + if (arg4 == NULL) { + SWIG_null_ref("wxBitmap"); + } + if (SWIG_arg_fail(4)) SWIG_fail; } - if (SWIG_arg_fail(4)) SWIG_fail; } if (obj4) { {