X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9416aa89ca06d0fb20b1002e026d2c7ac7aa6a17..a3870b2ff595ba4bb4f0397ace77ceeb9628e94d:/wxPython/src/helpers.cpp diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index 7bf489e671..74157b5271 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -117,7 +117,7 @@ void __wxPreStart() #ifdef WXP_WITH_THREAD PyEval_InitThreads(); - wxPyEventThreadState = PyThreadState_New(PyThreadState_Get()->interp); + wxPyEventThreadState = PyThreadState_Get(); // PyThreadState_New(PyThreadState_Get()->interp); #endif // Bail out if there is already windows created. This means that the @@ -305,7 +305,7 @@ PyObject* wxPyMake_wxObject(wxObject* source) { wxString msg("wxPython class not found for "); msg += source->GetClassInfo()->GetClassName(); PyErr_SetString(PyExc_NameError, msg.c_str()); - return NULL; + target = NULL; } } else { // source was NULL so return None. Py_INCREF(Py_None); target = Py_None; @@ -457,7 +457,7 @@ void wxPyCallback::EventThunker(wxEvent& event) { Py_DECREF(tuple); if (result) { Py_DECREF(result); - PyErr_Clear(); + PyErr_Clear(); // Just in case... } else { PyErr_Print(); }