wxProcess() fixes: will really call parent's event handler and will pass the

exited process status now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/process.h b/include/wx/process.h
index 94788268cb50b0abcf4464c9970400a5b2844c8a..dc4d5a43a9c94efe3e20246a47de0a76c8ce66d4 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -13,46 +13,55 @@
 #define _WX_PROCESSH__
 
 #ifdef __GNUG__
-#pragma interface "process.h"
+    #pragma interface "process.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/event.h"
 
-class WXDLLEXPORT wxProcess: public wxEvtHandler
+// Process Event handling
+class WXDLLEXPORT wxProcessEvent : public wxEvent
 {
-  DECLARE_DYNAMIC_CLASS(wxProcess)
- public:
+DECLARE_DYNAMIC_CLASS(wxProcessEvent)
 
-  wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1);
-  virtual ~wxProcess();
+public:
+    wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0) : wxEvent(id)
+    {
+        m_eventType = wxEVT_END_PROCESS;
+        m_pid = pid;
+        m_exitcode = exitcode;
+    }
 
-  virtual void OnTerminate(int pid);
+    // accessors
+        // PID of process which terminated
+    int GetPid() { return m_pid; }
 
- protected:
-  int m_id;
-};
+        // the exit code
+    int GetExitCode() { return m_exitcode; }
 
-// Process Event handling
+public:
+    int m_pid, m_exitcode;
+};
 
-class WXDLLEXPORT wxProcessEvent: public wxEvent
+// A wxProcess object should be passed to wxExecute - than its OnTerminate()
+// function will be called when the process terminates.
+class WXDLLEXPORT wxProcess : public wxEvtHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxProcessEvent)
- public:
+DECLARE_DYNAMIC_CLASS(wxProcess)
+
+public:
+    wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1);
 
-  wxProcessEvent(int id = 0, int pid = -1);
-  
-  inline int GetPid() { return m_pid; }
-  inline void SetPid(int pid) { m_pid = pid; }
+    virtual void OnTerminate(int pid, int status);
 
- public:
-  int m_pid;
+protected:
+    int m_id;
 };
 
 typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
 
-#define EVT_END_PROCESS(id, func) { wxEVT_END_PROCESS, id, -1, (wxObjectEvent) (wxEventFunction) (wxProcessEventFunction) & fn, NULL},
+#define EVT_END_PROCESS(id, func) { wxEVT_END_PROCESS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxProcessEventFunction) & func, NULL},
 
 #endif
     // _WX_PROCESSH__

diff --git a/src/common/process.cpp b/src/common/process.cpp
index d1c255ac95bc639c79543575a15074386234a162..d15c5d3b2008a819dc8fe590cceef81aa059c964 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -10,48 +10,38 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "process.h"
+    #pragma implementation "process.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
+    #include "wx/defs.h"
 #endif
 
 #include "wx/process.h"
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
+    IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
 #endif
 
 wxProcess::wxProcess(wxEvtHandler *parent, int id)
 {
   if (parent)
-    SetPreviousHandler(parent);
+    SetNextHandler(parent);
 
   m_id = id;
 }
 
-wxProcess::~wxProcess()
+void wxProcess::OnTerminate(int pid, int status)
 {
-}
-
-void wxProcess::OnTerminate(int pid)
-{
-  wxProcessEvent event(m_id, pid);
+  wxProcessEvent event(m_id, pid, status);
 
   ProcessEvent(event);
 }
-
-wxProcessEvent::wxProcessEvent(int id, int pid):
-  wxEvent(id), m_pid(pid)
-{
-}
-

diff --git a/src/gtk.inc b/src/gtk.inc
index 821187bd46c335f632279ac6b289d00f6b701e63..dc1df98371471d67dfee9331f8ebe6c890c45b3f 100644 (file)
--- a/src/gtk.inc
+++ b/src/gtk.inc
@@ -67,6 +67,7 @@ LIB_CPP_SRC=\
  common/tokenzr.cpp \
  common/resource.cpp \
  common/wxexpr.cpp \
+ common/process.cpp \
 \
  gtk/accel.cpp \
  gtk/app.cpp \

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 28d35e2adc6373c11a8181a77264ea69714937f4..f27d96bdf88e6281eb5256cc63d9b4d1c1e9329a 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -18,6 +18,8 @@
 #include "wx/intl.h"
 #include "wx/log.h"
 
+#include "wx/process.h"
+
 #include <stdarg.h>
 #include <dirent.h>
 #include <string.h>
@@ -266,17 +268,21 @@ static void GTK_EndProcessDetector(gpointer data, gint source,
     /* wait4 is not part of any standard, use at own risk
      * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-)
      * --- offer@sgi.com */
+    // VZ: wait4() will be woken up by a signal, not wait3 - so it's quite
+    //     different (also, wait3() waits for any child, wait4() only for this
+    //     one)
+    int status = -1;
 #if !defined(__sgi)
-    wait4(proc_data->pid, (int*) NULL, 0, (rusage *) NULL);
+    wait4(proc_data->pid, &status, 0, (rusage *) NULL);
 #else
-    wait3((int *) NULL, 0, (rusage *) NULL);
+    wait3(&status, 0, (rusage *) NULL);
 #endif
 
     close(source);
     gdk_input_remove(proc_data->tag);
 
     if (proc_data->process)
-        proc_data->process->OnTerminate(proc_data->pid);
+        proc_data->process->OnTerminate(proc_data->pid, status);
 
     if (proc_data->pid > 0)
         delete proc_data;

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 28d35e2adc6373c11a8181a77264ea69714937f4..f27d96bdf88e6281eb5256cc63d9b4d1c1e9329a 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -18,6 +18,8 @@
 #include "wx/intl.h"
 #include "wx/log.h"
 
+#include "wx/process.h"
+
 #include <stdarg.h>
 #include <dirent.h>
 #include <string.h>
@@ -266,17 +268,21 @@ static void GTK_EndProcessDetector(gpointer data, gint source,
     /* wait4 is not part of any standard, use at own risk
      * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-)
      * --- offer@sgi.com */
+    // VZ: wait4() will be woken up by a signal, not wait3 - so it's quite
+    //     different (also, wait3() waits for any child, wait4() only for this
+    //     one)
+    int status = -1;
 #if !defined(__sgi)
-    wait4(proc_data->pid, (int*) NULL, 0, (rusage *) NULL);
+    wait4(proc_data->pid, &status, 0, (rusage *) NULL);
 #else
-    wait3((int *) NULL, 0, (rusage *) NULL);
+    wait3(&status, 0, (rusage *) NULL);
 #endif
 
     close(source);
     gdk_input_remove(proc_data->tag);
 
     if (proc_data->process)
-        proc_data->process->OnTerminate(proc_data->pid);
+        proc_data->process->OnTerminate(proc_data->pid, status);
 
     if (proc_data->pid > 0)
         delete proc_data;