X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd9f7fea29e3f8bb61861f52984b7943512346ac..c437fde9f90fc7dfcac79053d214fc9146d7be21:/wxPython/src/_process.i diff --git a/wxPython/src/_process.i b/wxPython/src/_process.i index b3e1155429..bada7e7ac4 100644 --- a/wxPython/src/_process.i +++ b/wxPython/src/_process.i @@ -39,6 +39,13 @@ enum wxKillError wxKILL_ERROR // another, unspecified error }; +enum wxKillFlags +{ + wxKILL_NOCHILDREN = 0, // don't kill children + wxKILL_CHILDREN = 1 // kill children +}; + + enum wxSignal { wxSIGNONE = 0, // verify if the process exists under Unix @@ -71,10 +78,13 @@ IMP_PYCALLBACK_VOID_INTINT( wxPyProcess, wxProcess, OnTerminate); %} -%name(Process)class wxPyProcess : public wxEvtHandler { +%rename(Process) wxPyProcess; +class wxPyProcess : public wxEvtHandler { public: // kill the process with the given PID - static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM); + static wxKillError Kill(int pid, + wxSignal sig = wxSIGTERM, + int flags = wxKILL_NOCHILDREN); // test if the given process exists static bool Exists(int pid); @@ -89,7 +99,7 @@ public: static wxPyProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC); - %addtofunc wxPyProcess "self._setCallbackInfo(self, Process)" + %pythonAppend wxPyProcess "self._setCallbackInfo(self, Process)" wxPyProcess(wxEvtHandler *parent = NULL, int id = -1); void _setCallbackInfo(PyObject* self, PyObject* _class); @@ -155,15 +165,34 @@ enum // under Unix, if the process is the group leader then killing -pid kills // all children as well as pid - wxEXEC_MAKE_GROUP_LEADER = 4 + wxEXEC_MAKE_GROUP_LEADER = 4, + + // by default synchronous execution disables all program windows to avoid + // that the user interacts with the program while the child process is + // running, you can use this flag to prevent this from happening + wxEXEC_NODISABLE = 8 }; +MustHaveApp(wxExecute); + long wxExecute(const wxString& command, int flags = wxEXEC_ASYNC, wxPyProcess *process = NULL); + +%typemap(in,numinputs=0) wxKillError* rc ( wxKillError temp ) { $1 = &temp; } +%typemap(argout) wxKillError* rc +{ + PyObject* o; + o = PyInt_FromLong((long) (*$1)); + $result = t_output_helper($result, o); +} + +int wxKill(long pid, wxSignal sig = wxSIGTERM, wxKillError* rc, int flags = wxKILL_NOCHILDREN); + + //--------------------------------------------------------------------------- %init %{ wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");