icon support moved to wxBitmap, allowing for fully transparent usage

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

diff --git a/src/common/process.cpp b/src/common/process.cpp
index d1c255ac95bc639c79543575a15074386234a162..7d9cdbec7294fcbf678d091d73aac4c2e7a15168 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -2,56 +2,83 @@
 // 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__

-#pragma implementation "process.h"
+    #pragma implementation "process.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
+    #include "wx/defs.h"

 #endif
 
 #include "wx/process.h"
 
 #endif
 
 #include "wx/process.h"
 

-#if !USE_SHARED_LIBRARY
+DEFINE_EVENT_TYPE(wxEVT_END_PROCESS)
+

 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)
+void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect)

 {
 {

-  if (parent)
-    SetPreviousHandler(parent);
+    if ( parent )
+        SetNextHandler(parent);

 
 

-  m_id = id;
+    m_id         = id;
+    m_redirect   = redirect;
+
+#if wxUSE_STREAMS
+    m_inputStream  = NULL;
+    m_errorStream  = NULL;
+    m_outputStream = NULL;
+#endif // wxUSE_STREAMS

 }
 
 wxProcess::~wxProcess()
 {
 }
 
 wxProcess::~wxProcess()
 {

+#if wxUSE_STREAMS
+    delete m_inputStream;
+    delete m_errorStream;
+    delete m_outputStream;
+#endif // wxUSE_STREAMS

 }
 
 }
 

-void wxProcess::OnTerminate(int pid)
+void wxProcess::OnTerminate(int pid, int status)

 {
 {

-  wxProcessEvent event(m_id, pid);
+    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!

 }
 
 }
 

-wxProcessEvent::wxProcessEvent(int id, int pid):
-  wxEvent(id), m_pid(pid)
+void wxProcess::Detach()
+{
+    SetNextHandler(NULL);
+}
+
+#if wxUSE_STREAMS
+
+void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
+                               wxOutputStream *outputStream,
+                               wxInputStream *errorStream)

 {
 {

+    m_inputStream  = inputSstream;
+    m_errorStream  = errorStream;
+    m_outputStream = outputStream;

 }
 
 }
 

+#endif // wxUSE_STREAMS