remove unnecessary class definitions and variables

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

diff --git a/src/common/process.cpp b/src/common/process.cpp
index 7d9cdbec7294fcbf678d091d73aac4c2e7a15168..210068e955d73170945b274bd0f47e3f63d5af8d 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -1,17 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "process.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -20,24 +24,33 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
 #include "wx/process.h"
 
-DEFINE_EVENT_TYPE(wxEVT_END_PROCESS)
+// ----------------------------------------------------------------------------
+// event tables and such
+// ----------------------------------------------------------------------------
+
+wxDEFINE_EVENT( wxEVT_END_PROCESS, wxProcessEvent );
 
 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;
-    m_redirect   = redirect;
+    m_pid        = 0;
+    m_redirect   = (flags & wxPROCESS_REDIRECT) != 0;
 
 #if wxUSE_STREAMS
     m_inputStream  = NULL;
@@ -46,6 +59,28 @@ void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect)
 #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);
+    long pid = wxExecute(cmd, flags, process);
+    if( !pid )
+    {
+        // couldn't launch the process
+        delete process;
+        return NULL;
+    }
+
+    process->SetPid(pid);
+
+    return process;
+}
+
+// ----------------------------------------------------------------------------
+// wxProcess termination
+// ----------------------------------------------------------------------------
+
 wxProcess::~wxProcess()
 {
 #if wxUSE_STREAMS
@@ -67,9 +102,19 @@ 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;
 }
 
+// ----------------------------------------------------------------------------
+// process IO redirection
+// ----------------------------------------------------------------------------
+
 #if wxUSE_STREAMS
 
 void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
@@ -81,4 +126,53 @@ 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
+
+// ----------------------------------------------------------------------------
+// process killing
+// ----------------------------------------------------------------------------
+
+/* static */
+wxKillError wxProcess::Kill(int pid, wxSignal sig, int flags)
+{
+    wxKillError rc;
+    (void)wxKill(pid, sig, &rc, flags);
+
+    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( wxT("unexpected wxProcess::Kill() return code") );
+            // fall through
+
+        case wxKILL_NO_PROCESS:
+            return false;
+    }
+}
+