Apply parts of patch #1719888 to fix compilation on Mac and with

[wxWidgets.git] / wxPython / src / _process.i

diff --git a/wxPython/src/_process.i b/wxPython/src/_process.i
index eb08b3f1ea2eeee8cb11b9606d3a836bb68d80fc..55e45309a9c640b350d99349be224e85de526351 100644 (file)
--- a/wxPython/src/_process.i
+++ b/wxPython/src/_process.i
@@ -17,7 +17,7 @@
 %newgroup
 
 %{
 %newgroup
 
 %{

-%}    
+%}

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -39,6 +39,13 @@ enum wxKillError
     wxKILL_ERROR            // another, unspecified error
 };
 
     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
 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
 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);
 
     // test if the given process exists
     static bool Exists(int pid);


@@ -89,12 +99,20 @@ public:
     static wxPyProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC);
 
 
     static wxPyProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC);
 
 

-    %addtofunc wxPyProcess  "self._setCallbackInfo(self, Process)"
+    %pythonAppend wxPyProcess  setCallbackInfo(Process) "; self.this.own(False)"

     wxPyProcess(wxEvtHandler *parent = NULL, int id = -1);
     wxPyProcess(wxEvtHandler *parent = NULL, int id = -1);

+    ~wxPyProcess();

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 

-    void base_OnTerminate(int pid, int status);
+
+    DocDeclStr(
+        long , GetPid() const,
+        "get the process ID of the process executed by Open()", "");
+
+
+    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
 
     // call Redirect before passing the object to wxExecute() to redirect the
     // launched process stdin/stdout, then use GetInputStream() and


@@ -102,7 +120,7 @@ public:
     void Redirect();
     bool IsRedirected();
 
     void Redirect();
     bool IsRedirected();
 

-    
+

     // detach from the parent - should be called by the parent if it's deleted
     // before the process it started terminates
     void Detach();
     // detach from the parent - should be called by the parent if it's deleted
     // before the process it started terminates
     void Detach();


@@ -113,12 +131,20 @@ public:
 
     void CloseOutput();
 
 
     void CloseOutput();
 

-    // return TRUE if the child process stdout is not closed
+    // return True if the child process stdout is not closed

     bool IsInputOpened() const;
 
     bool IsInputOpened() const;
 

-    // return TRUE if any input is available on the child process stdout/err
+    // return True if any input is available on the child process stdout/err

     bool IsInputAvailable() const;
     bool IsErrorAvailable() const;
     bool IsInputAvailable() const;
     bool IsErrorAvailable() const;

+
+    %property(ErrorStream, GetErrorStream, doc="See `GetErrorStream`");
+    %property(InputStream, GetInputStream, doc="See `GetInputStream`");
+    %property(OutputStream, GetOutputStream, doc="See `GetOutputStream`");
+
+    %property(InputOpened, IsInputOpened);
+    %property(InputAvailable, IsInputAvailable);
+    %property(ErrorAvailable, IsErrorAvailable);

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -130,6 +156,9 @@ public:
     int GetPid();
     int GetExitCode();
     int m_pid, m_exitcode;
     int GetPid();
     int GetExitCode();
     int m_pid, m_exitcode;

+
+    %property(ExitCode, GetExitCode, doc="See `GetExitCode`");
+    %property(Pid, GetPid, doc="See `GetPid`");

 };
 
 
 };
 
 


@@ -155,15 +184,46 @@ enum
 
     // under Unix, if the process is the group leader then killing -pid kills
     // all children as well as pid
 
     // 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,
+
+    // by default, the event loop is run while waiting for synchronous execution
+    // to complete and this flag can be used to simply block the main process
+    // until the child process finishes
+    wxEXEC_NOEVENTS = 16,
+
+    // convenient synonym for flags given system()-like behaviour
+    wxEXEC_BLOCK = wxEXEC_SYNC | wxEXEC_NOEVENTS

 };
 
 
 };
 
 

+MustHaveApp(wxExecute);
+

 long wxExecute(const wxString& command,
                int flags = wxEXEC_ASYNC,
                wxPyProcess *process = NULL);
 
 
 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));
+#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);
+
+

 //---------------------------------------------------------------------------
 %init %{
     wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
 //---------------------------------------------------------------------------
 %init %{
     wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");