X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b767f7717866d5753a3b8d947534733083d9027f..1fee6e257780f17b4d53b48aa0e7d2ac69664595:/src/common/process.cpp

diff --git a/src/common/process.cpp b/src/common/process.cpp
index 0e9769d95e..36764bf2f5 100644
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -6,7 +6,7 @@
 // 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"
 
@@ -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
@@ -67,13 +64,16 @@ 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, flags, process) )
+    long pid = wxExecute(cmd, flags, process);
+    if( !pid )
     {
         // couldn't launch the process
         delete process;
         return NULL;
     }
 
+    process->SetPid(pid);
+
     return process;
 }
 
@@ -120,28 +120,21 @@ void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
     m_outputStream = outputStream;
 }
 
-// these are implemented in platform-dependent (and correct!) way under MSW and
-// Unix but we still have to provide these dummy versions for the other
-// platforms here
-#if !defined(__WIN32__) && !defined(__UNIX_LIKE__)
-
 bool wxProcess::IsInputOpened() const
 {
-    return m_inputStream != NULL;
+    return m_inputStream && m_inputStream->GetLastError() != wxSTREAM_EOF;
 }
 
 bool wxProcess::IsInputAvailable() const
 {
-    return m_inputStream && !m_inputStream->Eof();
+    return m_inputStream && m_inputStream->CanRead();
 }
 
 bool wxProcess::IsErrorAvailable() const
 {
-    return m_errorStream && !m_errorStream->Eof();
+    return m_errorStream && m_errorStream->CanRead();
 }
 
-#endif // !Win32 && !Unix
-
 #endif // wxUSE_STREAMS
 
 // ----------------------------------------------------------------------------
@@ -149,10 +142,10 @@ bool wxProcess::IsErrorAvailable() const
 // ----------------------------------------------------------------------------
 
 /* 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;
 }
@@ -164,7 +157,7 @@ bool wxProcess::Exists(int pid)
     {
         case wxKILL_OK:
         case wxKILL_ACCESS_DENIED:
-            return TRUE;
+            return true;
 
         default:
         case wxKILL_ERROR:
@@ -173,7 +166,7 @@ bool wxProcess::Exists(int pid)
             // fall through
 
         case wxKILL_NO_PROCESS:
-            return FALSE;
+            return false;
     }
 }