X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca7731b7c89693a5bf60b2e259757ece780f8f1a..181cbcf49ee56d4a3ce50a894bc6a76be79ad2f5:/src/common/process.cpp diff --git a/src/common/process.cpp b/src/common/process.cpp index f0e30ba9ad..5a3f23843a 100644 --- a/src/common/process.cpp +++ b/src/common/process.cpp @@ -2,46 +2,81 @@ // 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 -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #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__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/defs.h" + #include "wx/defs.h" #endif #include "wx/process.h" -#if !USE_SHARED_LIBRARY 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_redirect = redirect; - m_id = id; +#if wxUSE_STREAMS + m_inputStream = NULL; + m_errorStream = NULL; + m_outputStream = NULL; +#endif // wxUSE_STREAMS } -void wxProcess::OnTerminate(int pid) +wxProcess::~wxProcess() { - wxProcessEvent event(m_id, pid); +#if wxUSE_STREAMS + delete m_inputStream; + delete m_errorStream; + delete m_outputStream; +#endif // wxUSE_STREAMS +} - ProcessEvent(event); +void wxProcess::OnTerminate(int pid, int status) +{ + wxProcessEvent event(m_id, pid, status); + + if ( !ProcessEvent(event) ) + delete this; + //else: the object which processed the event is responsible for deleting + // us! } + +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