diff --git a/etg/listctrl.py b/etg/listctrl.py index 9acac2a0..d25171da 100644 --- a/etg/listctrl.py +++ b/etg/listctrl.py @@ -82,7 +82,7 @@ def run(): PyObject* args = Py_BuildValue("(LL)", item1, item2); #endif - PyObject* result = PyEval_CallObject(func, args); + PyObject* result = PyObject_CallObject(func, args); Py_DECREF(args); if (result) { retval = wxPyInt_AsLong(result); diff --git a/samples/embedded/embedded.cpp b/samples/embedded/embedded.cpp index 8299c63d..dbb361d1 100644 --- a/samples/embedded/embedded.cpp +++ b/samples/embedded/embedded.cpp @@ -276,7 +276,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent) wxASSERT(arg != NULL); PyObject* tuple = PyTuple_New(1); PyTuple_SET_ITEM(tuple, 0, arg); - result = PyEval_CallObject(func, tuple); + result = PyObject_CallObject(func, tuple); // Was there an exception? if (! result) diff --git a/src/event_ex.cpp b/src/event_ex.cpp index 1f965519..80c2b89d 100644 --- a/src/event_ex.cpp +++ b/src/event_ex.cpp @@ -50,7 +50,7 @@ void wxPyCallback::EventThunker(wxEvent& event) { // Call the event handler, passing the event object tuple = PyTuple_New(1); PyTuple_SET_ITEM(tuple, 0, arg); // steals ref to arg - result = PyEval_CallObject(func, tuple); + result = PyObject_CallObject(func, tuple); if ( result ) { Py_DECREF(result); // result is ignored, but we still need to decref it PyErr_Clear(); // Just in case... diff --git a/src/stream_input.cpp b/src/stream_input.cpp index 6f6f6d3b..b02044f3 100644 --- a/src/stream_input.cpp +++ b/src/stream_input.cpp @@ -84,7 +84,7 @@ protected: wxPyThreadBlocker blocker; PyObject* arglist = Py_BuildValue("(i)", bufsize); - PyObject* result = PyEval_CallObject(m_read, arglist); + PyObject* result = PyObject_CallObject(m_read, arglist); Py_DECREF(arglist); size_t o = 0; @@ -122,7 +122,7 @@ protected: PyTuple_SET_ITEM(arglist, 1, wxPyInt_FromLong(mode)); - PyObject* result = PyEval_CallObject(m_seek, arglist); + PyObject* result = PyObject_CallObject(m_seek, arglist); Py_DECREF(arglist); Py_XDECREF(result); return OnSysTell(); @@ -132,7 +132,7 @@ protected: { wxPyThreadBlocker blocker; PyObject* arglist = Py_BuildValue("()"); - PyObject* result = PyEval_CallObject(m_tell, arglist); + PyObject* result = PyObject_CallObject(m_tell, arglist); Py_DECREF(arglist); wxFileOffset o = 0; if (result != NULL) { diff --git a/src/stream_output.cpp b/src/stream_output.cpp index c135e209..e2cba7bc 100644 --- a/src/stream_output.cpp +++ b/src/stream_output.cpp @@ -92,7 +92,7 @@ protected: PyObject* arglist = PyTuple_New(1); PyTuple_SET_ITEM(arglist, 0, PyBytes_FromStringAndSize((char*)buffer, bufsize)); - PyObject* result = PyEval_CallObject(m_write, arglist); + PyObject* result = PyObject_CallObject(m_write, arglist); Py_DECREF(arglist); if (result != NULL) @@ -116,7 +116,7 @@ protected: PyTuple_SET_ITEM(arglist, 1, wxPyInt_FromLong(mode)); - PyObject* result = PyEval_CallObject(m_seek, arglist); + PyObject* result = PyObject_CallObject(m_seek, arglist); Py_DECREF(arglist); Py_XDECREF(result); return OnSysTell(); @@ -126,7 +126,7 @@ protected: { wxPyThreadBlocker blocker; PyObject* arglist = Py_BuildValue("()"); - PyObject* result = PyEval_CallObject(m_tell, arglist); + PyObject* result = PyObject_CallObject(m_tell, arglist); Py_DECREF(arglist); wxFileOffset o = 0; if (result != NULL) {