X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f4c0a16186cae6d4a780b59314532fab473fb0b..2abd8d78a69cbe726f957de91929feeeac21cfb0:/wxPython/contrib/iewin/iewin_wrap.cpp?ds=sidebyside diff --git a/wxPython/contrib/iewin/iewin_wrap.cpp b/wxPython/contrib/iewin/iewin_wrap.cpp index 2f5be3c598..2f7735599e 100644 --- a/wxPython/contrib/iewin/iewin_wrap.cpp +++ b/wxPython/contrib/iewin/iewin_wrap.cpp @@ -310,7 +310,15 @@ SWIG_CheckLongInRange(long value, const char* type, SWIGSTATICINLINE(long) SWIG_AsLong(PyObject * obj) { - return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); + if (PyNumber_Check(obj)) + return PyInt_AsLong(obj); + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + return 0; + } } @@ -645,7 +653,9 @@ static PyObject *_wrap_IEHtmlWin_LoadString(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -689,7 +699,9 @@ static PyObject *_wrap_IEHtmlWin_LoadStream(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (created2) delete arg2; @@ -785,7 +797,9 @@ static PyObject *_wrap_IEHtmlWin_GetEditMode(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -887,7 +901,9 @@ static PyObject *_wrap_IEHtmlWin_GoBack(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -913,7 +929,9 @@ static PyObject *_wrap_IEHtmlWin_GoForward(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -939,7 +957,9 @@ static PyObject *_wrap_IEHtmlWin_GoHome(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -965,7 +985,9 @@ static PyObject *_wrap_IEHtmlWin_GoSearch(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -995,7 +1017,9 @@ static PyObject *_wrap_IEHtmlWin_RefreshPage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -1021,7 +1045,9 @@ static PyObject *_wrap_IEHtmlWin_Stop(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL;