Added wxFileName::GetModificationTime()

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

diff --git a/src/common/process.cpp b/src/common/process.cpp
index dd80b31466da578a781607ecdaec59147908ffc2..7d9cdbec7294fcbf678d091d73aac4c2e7a15168 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -26,6 +26,8 @@
 
 #include "wx/process.h"
 
 
 #include "wx/process.h"
 

+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)
 


@@ -36,14 +38,21 @@ void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect)
 
     m_id         = id;
     m_redirect   = redirect;
 
     m_id         = id;
     m_redirect   = redirect;

+
+#if wxUSE_STREAMS

     m_inputStream  = NULL;
     m_inputStream  = NULL;

+    m_errorStream  = NULL;

     m_outputStream = NULL;
     m_outputStream = NULL;

+#endif // wxUSE_STREAMS

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

+#if wxUSE_STREAMS

     delete m_inputStream;
     delete m_inputStream;

+    delete m_errorStream;

     delete m_outputStream;
     delete m_outputStream;

+#endif // wxUSE_STREAMS

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


@@ -61,9 +70,15 @@ void wxProcess::Detach()
     SetNextHandler(NULL);
 }
 
     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