X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53aa7709e08bb3cdaa8ec5c4977f32e817aff7d6..db679b8c836e69c111cdc31e62cf92cebe4f938f:/wxPython/src/mac/xrc_wrap.cpp diff --git a/wxPython/src/mac/xrc_wrap.cpp b/wxPython/src/mac/xrc_wrap.cpp index 7cc5dc9365..c5e5990b95 100644 --- a/wxPython/src/mac/xrc_wrap.cpp +++ b/wxPython/src/mac/xrc_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; } } @@ -4527,7 +4528,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO PyErr_Clear(); // clear the failure of the wxPyConvert above arg1 = wxPyCBInputStream_create(obj0, false); if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created1 = true; @@ -4549,8 +4550,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxXmlDocument, 1); { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -4559,8 +4559,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyO return resultobj; fail: { - if (created1) - delete arg1; + if (created1) delete arg1; } { if (temp2) @@ -4708,7 +4707,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py PyErr_Clear(); // clear the failure of the wxPyConvert above arg2 = wxPyCBInputStream_create(obj1, false); if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); SWIG_fail; } created2 = true; @@ -4732,8 +4731,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3) @@ -4742,8 +4740,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, Py return resultobj; fail: { - if (created2) - delete arg2; + if (created2) delete arg2; } { if (temp3)