X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b8c7ba607a15a2ff8a04448138df9ffff7df6c5..bc50a2ae95f2ab36b16ceedc7902a9cbfb2f70ea:/wxPython/src/_process.i?ds=sidebyside diff --git a/wxPython/src/_process.i b/wxPython/src/_process.i index bada7e7ac4..b256ae7114 100644 --- a/wxPython/src/_process.i +++ b/wxPython/src/_process.i @@ -104,8 +104,9 @@ public: void _setCallbackInfo(PyObject* self, PyObject* _class); - void base_OnTerminate(int pid, int status); - + void OnTerminate(int pid, int status); + %MAKE_BASE_FUNC(Process, OnTerminate); + // call Redirect before passing the object to wxExecute() to redirect the // launched process stdin/stdout, then use GetInputStream() and // GetOutputStream() to get access to them @@ -187,7 +188,11 @@ long wxExecute(const wxString& command, { PyObject* o; o = PyInt_FromLong((long) (*$1)); +#if SWIG_VERSION < 0x010328 $result = t_output_helper($result, o); +#else + $result = SWIG_Python_AppendOutput($result, o); +#endif } int wxKill(long pid, wxSignal sig = wxSIGTERM, wxKillError* rc, int flags = wxKILL_NOCHILDREN);