Merge recent wxPython changes from 2.8 branch to HEAD

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

diff --git a/wxPython/src/_process.i b/wxPython/src/_process.i
index 756302cb84a17ccb2a617a739a067a3637bed9d0..55e45309a9c640b350d99349be224e85de526351 100644 (file)
--- a/wxPython/src/_process.i
+++ b/wxPython/src/_process.i
@@ -99,7 +99,7 @@ public:
     static wxPyProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC);
 
 
-    %pythonAppend wxPyProcess  "self._setCallbackInfo(self, Process); self.this.own(False)"
+    %pythonAppend wxPyProcess  setCallbackInfo(Process) "; self.this.own(False)"
     wxPyProcess(wxEvtHandler *parent = NULL, int id = -1);
     ~wxPyProcess();
 
@@ -189,7 +189,15 @@ enum
     // 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
+    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
 };