fixed bug in wxHtmlWindow: HistoryBack/Forward now correctly preserves last entry...

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

diff --git a/src/common/process.cpp b/src/common/process.cpp
index e573fe8e0d995ba5682845f407c927d3a27cda94..5a3f23843a2f4826f08913325947fc8c2deea573 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -29,23 +29,28 @@
 IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
 

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

 {
 {

-    if (parent)
+    if ( parent )

         SetNextHandler(parent);
 
     m_id         = id;
         SetNextHandler(parent);
 
     m_id         = id;

-    m_needPipe   = needPipe;
-    m_in_stream  = NULL;
-    m_out_stream = NULL;
+    m_redirect   = redirect;
+
+#if wxUSE_STREAMS
+    m_inputStream  = NULL;
+    m_errorStream  = NULL;
+    m_outputStream = NULL;
+#endif // wxUSE_STREAMS

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

-    if (m_in_stream)
-      delete m_in_stream;
-    if (m_out_stream)
-      delete m_out_stream;
+#if wxUSE_STREAMS
+    delete m_inputStream;
+    delete m_errorStream;
+    delete m_outputStream;
+#endif // wxUSE_STREAMS

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


@@ -63,23 +68,15 @@ void wxProcess::Detach()
     SetNextHandler(NULL);
 }
 
     SetNextHandler(NULL);
 }
 

-void wxProcess::SetPipeStreams(wxInputStream *in_stream, wxOutputStream *out_stream)
-{
-    m_in_stream  = in_stream;
-    m_out_stream = out_stream;
-}
-
-wxInputStream *wxProcess::GetInputStream() const
-{
-    return m_in_stream;
-}
+#if wxUSE_STREAMS

 
 

-wxOutputStream *wxProcess::GetOutputStream() const
+void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
+                               wxOutputStream *outputStream,
+                               wxInputStream *errorStream)

 {
 {

-    return m_out_stream;
+    m_inputStream  = inputSstream;
+    m_errorStream  = errorStream;
+    m_outputStream = outputStream;

 }
 
 }
 

-bool wxProcess::NeedPipe() const
-{
-    return m_needPipe;
-}
+#endif // wxUSE_STREAMS