another try at mingw32 compilation fix

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

diff --git a/src/common/process.cpp b/src/common/process.cpp
index 05e24ffb206d4804c2f0b6639d2f4ecacb5b4d86..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
 // Created:     24/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "process.h"
 #endif
 
     #pragma implementation "process.h"
 #endif
 


@@ -47,13 +47,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
 // wxProcess creation
 // ----------------------------------------------------------------------------
 
 // wxProcess creation
 // ----------------------------------------------------------------------------
 

-void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect)
+#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 )
         SetNextHandler(parent);
 
     m_id         = id;
 {
     if ( parent )
         SetNextHandler(parent);
 
     m_id         = id;

-    m_redirect   = redirect;
+    m_redirect   = (flags & wxPROCESS_REDIRECT) != 0;

 
 #if wxUSE_STREAMS
     m_inputStream  = NULL;
 
 #if wxUSE_STREAMS
     m_inputStream  = NULL;


@@ -62,6 +71,21 @@ void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect)
 #endif // wxUSE_STREAMS
 }
 
 #endif // wxUSE_STREAMS
 }
 

+/* static */
+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) )
+    {
+        // couldn't launch the process
+        delete process;
+        return NULL;
+    }
+
+    return process;
+}
+

 // ----------------------------------------------------------------------------
 // wxProcess termination
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxProcess termination
 // ----------------------------------------------------------------------------


@@ -105,6 +129,21 @@ void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
     m_outputStream = outputStream;
 }
 
     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
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_STREAMS
 
 // ----------------------------------------------------------------------------


@@ -112,10 +151,10 @@ void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
 // ----------------------------------------------------------------------------
 
 /* static */
 // ----------------------------------------------------------------------------
 
 /* static */

-wxKillError wxProcess::Kill(int pid, wxSignal sig)
+wxKillError wxProcess::Kill(int pid, wxSignal sig, int flags)

 {
     wxKillError rc;
 {
     wxKillError rc;

-    (void)wxKill(pid, sig, &rc);
+    (void)wxKill(pid, sig, &rc, flags);

 
     return rc;
 }
 
     return rc;
 }


@@ -127,7 +166,7 @@ bool wxProcess::Exists(int pid)
     {
         case wxKILL_OK:
         case wxKILL_ACCESS_DENIED:
     {
         case wxKILL_OK:
         case wxKILL_ACCESS_DENIED:

-            return TRUE;
+            return true;

 
         default:
         case wxKILL_ERROR:
 
         default:
         case wxKILL_ERROR:


@@ -136,7 +175,7 @@ bool wxProcess::Exists(int pid)
             // fall through
 
         case wxKILL_NO_PROCESS:
             // fall through
 
         case wxKILL_NO_PROCESS:

-            return FALSE;
+            return false;

     }
 }
 
     }
 }