applying OSAF patch for "toolbar selection not correct on Mac after calling Realize...

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

diff --git a/src/common/process.cpp b/src/common/process.cpp
index 0e9769d95e62a78a350953cf83a6a9fbeb9bfb45..518549e660f8571cb89841f3f3e22227fb64fb47 100644 (file)
--- 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,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "process.h"
 #endif
 
@@ -47,6 +47,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
 // wxProcess creation
 // ----------------------------------------------------------------------------
 
+#if WXWIN_COMPATIBILITY_2_2
+
+wxProcess::wxProcess(wxEvtHandler *parent, bool redirect)
+{
+    Init(parent, wxID_ANY, redirect ? wxPROCESS_REDIRECT : wxPROCESS_DEFAULT);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_2
+
 void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
 {
     if ( parent )
@@ -120,28 +129,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 +151,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 +166,7 @@ bool wxProcess::Exists(int pid)
     {
         case wxKILL_OK:
         case wxKILL_ACCESS_DENIED:
-            return TRUE;
+            return true;
 
         default:
         case wxKILL_ERROR:
@@ -173,7 +175,7 @@ bool wxProcess::Exists(int pid)
             // fall through
 
         case wxKILL_NO_PROCESS:
-            return FALSE;
+            return false;
     }
 }