X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da00a8bb164dd1f58dd0bb211475538a375867b4..77c8efc8c37da6d6a5e2e8022d21d1cd7d76371d:/src/common/process.cpp

diff --git a/src/common/process.cpp b/src/common/process.cpp
index d98c7178ef..210068e955 100644
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        process.cpp
+// Name:        src/common/process.cpp
 // Purpose:     Process termination classes
 // Author:      Guilhem Lavaux
 // 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 licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "process.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -34,7 +30,7 @@
 // event tables and such
 // ----------------------------------------------------------------------------
 
-DEFINE_EVENT_TYPE(wxEVT_END_PROCESS)
+wxDEFINE_EVENT( wxEVT_END_PROCESS, wxProcessEvent );
 
 IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
@@ -53,6 +49,7 @@ void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
         SetNextHandler(parent);
 
     m_id         = id;
+    m_pid        = 0;
     m_redirect   = (flags & wxPROCESS_REDIRECT) != 0;
 
 #if wxUSE_STREAMS
@@ -63,16 +60,20 @@ void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
 }
 
 /* static */
-wxProcess *wxProcess::Open(const wxString& cmd)
+wxProcess *wxProcess::Open(const wxString& cmd, int flags)
 {
+    wxASSERT_MSG( !(flags & wxEXEC_SYNC), wxT("wxEXEC_SYNC should not be used." ));
     wxProcess *process = new wxProcess(wxPROCESS_REDIRECT);
-    if ( !wxExecute(cmd, wxEXEC_ASYNC, process) )
+    long pid = wxExecute(cmd, flags, process);
+    if( !pid )
     {
         // couldn't launch the process
         delete process;
         return NULL;
     }
 
+    process->SetPid(pid);
+
     return process;
 }
 
@@ -101,7 +102,13 @@ void wxProcess::OnTerminate(int pid, int status)
 
 void wxProcess::Detach()
 {
-    SetNextHandler(NULL);
+    // we just detach from the next handler of the chain (i.e. our "parent" -- see ctor)
+    // not also from the previous handler like wxEvtHandler::Unlink() would do:
+
+    if (m_nextHandler)
+        m_nextHandler->SetPreviousHandler(m_previousHandler);
+
+    m_nextHandler = NULL;
 }
 
 // ----------------------------------------------------------------------------
@@ -119,6 +126,21 @@ void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
     m_outputStream = outputStream;
 }
 
+bool wxProcess::IsInputOpened() const
+{
+    return m_inputStream && m_inputStream->GetLastError() != wxSTREAM_EOF;
+}
+
+bool wxProcess::IsInputAvailable() const
+{
+    return m_inputStream && m_inputStream->CanRead();
+}
+
+bool wxProcess::IsErrorAvailable() const
+{
+    return m_errorStream && m_errorStream->CanRead();
+}
+
 #endif // wxUSE_STREAMS
 
 // ----------------------------------------------------------------------------
@@ -126,10 +148,10 @@ void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
 // ----------------------------------------------------------------------------
 
 /* static */
-wxKillError wxProcess::Kill(int pid, wxSignal sig)
+wxKillError wxProcess::Kill(int pid, wxSignal sig, int flags)
 {
     wxKillError rc;
-    (void)wxKill(pid, sig, &rc);
+    (void)wxKill(pid, sig, &rc, flags);
 
     return rc;
 }
@@ -141,16 +163,16 @@ bool wxProcess::Exists(int pid)
     {
         case wxKILL_OK:
         case wxKILL_ACCESS_DENIED:
-            return TRUE;
+            return true;
 
         default:
         case wxKILL_ERROR:
         case wxKILL_BAD_SIGNAL:
-            wxFAIL_MSG( _T("unexpected wxProcess::Kill() return code") );
+            wxFAIL_MSG( wxT("unexpected wxProcess::Kill() return code") );
             // fall through
 
         case wxKILL_NO_PROCESS:
-            return FALSE;
+            return false;
     }
 }