fix VC 7.x release build problems

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

diff --git a/src/common/process.cpp b/src/common/process.cpp
index 7d9cdbec7294fcbf678d091d73aac4c2e7a15168..cffb5f85693ff86c36c5c83073429cb02ece5f02 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -6,9 +6,17 @@
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

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


@@ -20,24 +28,32 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-

 #include "wx/process.h"
 
 #include "wx/process.h"
 

+// ----------------------------------------------------------------------------
+// event tables and such
+// ----------------------------------------------------------------------------
+

 DEFINE_EVENT_TYPE(wxEVT_END_PROCESS)
 
 IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
 
 DEFINE_EVENT_TYPE(wxEVT_END_PROCESS)
 
 IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
 

-void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect)
+// ============================================================================
+// wxProcess implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxProcess creation
+// ----------------------------------------------------------------------------
+
+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;


@@ -46,6 +62,25 @@ 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::~wxProcess()
 {
 #if wxUSE_STREAMS
 wxProcess::~wxProcess()
 {
 #if wxUSE_STREAMS


@@ -70,6 +105,10 @@ void wxProcess::Detach()
     SetNextHandler(NULL);
 }
 
     SetNextHandler(NULL);
 }
 

+// ----------------------------------------------------------------------------
+// process IO redirection
+// ----------------------------------------------------------------------------
+

 #if wxUSE_STREAMS
 
 void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
 #if wxUSE_STREAMS
 
 void wxProcess::SetPipeStreams(wxInputStream *inputSstream,


@@ -81,4 +120,53 @@ 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

+
+// ----------------------------------------------------------------------------
+// process killing
+// ----------------------------------------------------------------------------
+
+/* static */
+wxKillError wxProcess::Kill(int pid, wxSignal sig)
+{
+    wxKillError rc;
+    (void)wxKill(pid, sig, &rc);
+
+    return rc;
+}
+
+/* static */
+bool wxProcess::Exists(int pid)
+{
+    switch ( Kill(pid, wxSIGNONE) )
+    {
+        case wxKILL_OK:
+        case wxKILL_ACCESS_DENIED:
+            return TRUE;
+
+        default:
+        case wxKILL_ERROR:
+        case wxKILL_BAD_SIGNAL:
+            wxFAIL_MSG( _T("unexpected wxProcess::Kill() return code") );
+            // fall through
+
+        case wxKILL_NO_PROCESS:
+            return FALSE;
+    }
+}
+