implemented wxFileName::SplitPath(), wxSplitPath() now just calls it

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

diff --git a/include/wx/process.h b/include/wx/process.h
index dc4d5a43a9c94efe3e20246a47de0a76c8ce66d4..ea2fc303d880e9f1d437ac7dcdec8ffa28ded5c9 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -2,11 +2,11 @@
 // 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
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROCESSH__
@@ -20,6 +20,10 @@
 #include "wx/object.h"
 #include "wx/event.h"
 
+#if wxUSE_STREAMS
+#include "wx/stream.h"
+#endif
+
 // Process Event handling
 class WXDLLEXPORT wxProcessEvent : public wxEvent
 {
@@ -51,12 +55,53 @@ class WXDLLEXPORT wxProcess : public wxEvtHandler
 DECLARE_DYNAMIC_CLASS(wxProcess)
 
 public:
-    wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1);
+    wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1)
+        { Init(parent, id, FALSE); }
+    wxProcess(wxEvtHandler *parent, bool redirect)
+        { Init(parent, -1, redirect); }
+
+    virtual ~wxProcess();
 
+    // may be overridden to be notified about process termination
     virtual void OnTerminate(int pid, int status);
 
+    // call this before passing the object to wxExecute() to redirect the
+    // launched process stdin/stdout, then use GetInputStream() and
+    // GetOutputStream() to get access to them
+    void Redirect() { m_redirect = TRUE; }
+    bool IsRedirected() const { return m_redirect; }
+
+    // detach from the parent - should be called by the parent if it's deleted
+    // before the process it started terminates
+    void Detach();
+
+#if wxUSE_STREAMS
+    // Pipe handling
+    wxInputStream *GetInputStream() const { return m_inputStream; }
+    wxInputStream *GetErrorStream() const { return m_errorStream; }
+    wxOutputStream *GetOutputStream() const { return m_outputStream; }
+
+    // close the output stream indicating that nothing more will be written
+    void CloseOutput() { delete m_outputStream; m_outputStream = NULL; }
+
+    // implementation only (for wxExecute)
+    void SetPipeStreams(wxInputStream *inStream,
+                        wxOutputStream *outStream,
+                        wxInputStream *errStream);
+#endif // wxUSE_STREAMS
+
 protected:
+    void Init(wxEvtHandler *parent, int id, bool redirect);
+
     int m_id;
+
+#if wxUSE_STREAMS
+    wxInputStream  *m_inputStream,
+                   *m_errorStream;
+    wxOutputStream *m_outputStream;
+#endif // wxUSE_STREAMS
+
+    bool m_redirect;
 };
 
 typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);