X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd6ce4a90c11b54cc00799d0e4611d858739a749..ce16e5d78fad60b6bbc6ef8889a663fd1c9f23d2:/src/common/process.cpp diff --git a/src/common/process.cpp b/src/common/process.cpp index dd80b31466..7d9cdbec72 100644 --- a/src/common/process.cpp +++ b/src/common/process.cpp @@ -26,6 +26,8 @@ #include "wx/process.h" +DEFINE_EVENT_TYPE(wxEVT_END_PROCESS) + IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent) @@ -36,14 +38,21 @@ void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect) m_id = id; m_redirect = redirect; + +#if wxUSE_STREAMS m_inputStream = NULL; + m_errorStream = NULL; m_outputStream = NULL; +#endif // wxUSE_STREAMS } wxProcess::~wxProcess() { +#if wxUSE_STREAMS delete m_inputStream; + delete m_errorStream; delete m_outputStream; +#endif // wxUSE_STREAMS } void wxProcess::OnTerminate(int pid, int status) @@ -61,9 +70,15 @@ void wxProcess::Detach() SetNextHandler(NULL); } -void wxProcess::SetPipeStreams(wxInputStream *in_stream, wxOutputStream *out_stream) +#if wxUSE_STREAMS + +void wxProcess::SetPipeStreams(wxInputStream *inputSstream, + wxOutputStream *outputStream, + wxInputStream *errorStream) { - m_inputStream = in_stream; - m_outputStream = out_stream; + m_inputStream = inputSstream; + m_errorStream = errorStream; + m_outputStream = outputStream; } +#endif // wxUSE_STREAMS