oops... fixed a typo

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

diff --git a/include/wx/process.h b/include/wx/process.h
index b612306a661a2c313f557da3c16fe4547860af19..d0bff5c627cd4d2c79509571476f38af3e46174d 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -20,7 +20,14 @@
 #include "wx/object.h"
 #include "wx/event.h"
 
 #include "wx/object.h"
 #include "wx/event.h"
 

-// Process Event handling
+#if wxUSE_STREAMS
+#include "wx/stream.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// wxProcessEvent: event used with wxProcess
+// ----------------------------------------------------------------------------
+

 class WXDLLEXPORT wxProcessEvent : public wxEvent
 {
 DECLARE_DYNAMIC_CLASS(wxProcessEvent)
 class WXDLLEXPORT wxProcessEvent : public wxEvent
 {
 DECLARE_DYNAMIC_CLASS(wxProcessEvent)


@@ -44,28 +51,77 @@ public:
     int m_pid, m_exitcode;
 };
 
     int m_pid, m_exitcode;
 };
 

+// ----------------------------------------------------------------------------

 // A wxProcess object should be passed to wxExecute - than its OnTerminate()
 // function will be called when the process terminates.
 // 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(wxProcess)
 
 public:
 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);
 
     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();
 
     // 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:
 protected:

+    void Init(wxEvtHandler *parent, int id, bool redirect);
+

     int m_id;
     int m_id;

+
+#if wxUSE_STREAMS
+    wxInputStream  *m_inputStream,
+                   *m_errorStream;
+    wxOutputStream *m_outputStream;
+#endif // wxUSE_STREAMS
+
+    bool m_redirect;

 };
 
 };
 

+// ----------------------------------------------------------------------------
+// wxProcess events
+// ----------------------------------------------------------------------------
+
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_END_PROCESS, 440)
+END_DECLARE_EVENT_TYPES()
+

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

-#define EVT_END_PROCESS(id, func) { wxEVT_END_PROCESS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxProcessEventFunction) & func, NULL},
+#define EVT_END_PROCESS(id, func) \
+   DECLARE_EVENT_TABLE_ENTRY( wxEVT_END_PROCESS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxProcessEventFunction) & func, NULL),

 
 #endif
     // _WX_PROCESSH__
 
 #endif
     // _WX_PROCESSH__