moved wxDash typedef to gdicmn.h

[wxWidgets.git] / src / common / process.cpp

diff --git a/src/common/process.cpp b/src/common/process.cpp
index d15c5d3b2008a819dc8fe590cceef81aa059c964..dd80b31466da578a781607ecdaec59147908ffc2 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -2,11 +2,11 @@
 // Name:        process.cpp
 // Purpose:     Process termination classes
 // Author:      Guilhem Lavaux
 // Name:        process.cpp
 // Purpose:     Process termination classes
 // 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) Guilhem Lavaux
 // Created:     24/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -26,22 +26,44 @@
 
 #include "wx/process.h"
 
 
 #include "wx/process.h"
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)

 
 

-wxProcess::wxProcess(wxEvtHandler *parent, int id)
+void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect)

 {
 {

-  if (parent)
-    SetNextHandler(parent);
+    if ( parent )
+        SetNextHandler(parent);
+
+    m_id         = id;
+    m_redirect   = redirect;
+    m_inputStream  = NULL;
+    m_outputStream = NULL;
+}

 
 

-  m_id = id;
+wxProcess::~wxProcess()
+{
+    delete m_inputStream;
+    delete m_outputStream;

 }
 
 void wxProcess::OnTerminate(int pid, int status)
 {
 }
 
 void wxProcess::OnTerminate(int pid, int status)
 {

-  wxProcessEvent event(m_id, pid, status);
+    wxProcessEvent event(m_id, pid, status);

 
 

-  ProcessEvent(event);
+    if ( !ProcessEvent(event) )
+        delete this;
+    //else: the object which processed the event is responsible for deleting
+    //      us!

 }
 }

+
+void wxProcess::Detach()
+{
+    SetNextHandler(NULL);
+}
+
+void wxProcess::SetPipeStreams(wxInputStream *in_stream, wxOutputStream *out_stream)
+{
+    m_inputStream  = in_stream;
+    m_outputStream = out_stream;
+}
+