Some corrections

[wxWidgets.git] / include / wx / process.h

diff --git a/include/wx/process.h b/include/wx/process.h
index a6dc295a6293a60b6a23012a6e35fee60456e95d..19ae35c1f65b9b88dbf5c4fce978d6c338b55e58 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -2,57 +2,85 @@
 // Name:        process.h
 // Purpose:     wxProcess class
 // Author:      Guilhem Lavaux
 // Name:        process.h
 // Purpose:     wxProcess class
 // Author:      Guilhem Lavaux

-// Modified by:
+// Modified by: Vadim Zeitlin to check error codes, added Detach() method

 // Created:     24/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Created:     24/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Guilhem Lavaux

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROCESSH__
 #define _WX_PROCESSH__
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROCESSH__
 #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"
 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/event.h"

+#include "wx/stream.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, bool needPipe = FALSE, int id = -1);
+    ~wxProcess();
+
+    virtual void OnTerminate(int pid, int status);
+
+    // detach from the parent - should be called by the parent if it's deleted
+    // before the process it started terminates
+    void Detach();
+
+    // Pipe handling
+    wxInputStream *GetInputStream() const;
+    wxOutputStream *GetOutputStream() const;

 
 

-  wxProcessEvent(int id = 0, int pid = -1);
-  
-  inline int GetPid() { return m_pid; }
-  inline void SetPid(int pid) { m_pid = pid; }
+    // These functions should not be called by the usual user. They are only
+    // intended to be used by wxExecute.
+    // Install pipes
+    void SetPipeStreams(wxInputStream *in_stream, wxOutputStream *out_stream);
+    bool NeedPipe() const;

 
 

- public:
-  int m_pid;
+protected:
+    int m_id;
+    bool m_needPipe;
+    wxInputStream *m_in_stream;
+    wxOutputStream *m_out_stream;

 };
 
 typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
 
 };
 
 typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
 

-#define EVT_END_PROCESS(id, func) { wxEVT_END_TERMINATE, 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__
 
 #endif
     // _WX_PROCESSH__