change superflous elif to else

[wxWidgets.git] / include / wx / process.h

diff --git a/include/wx/process.h b/include/wx/process.h
index 19ae35c1f65b9b88dbf5c4fce978d6c338b55e58..baaea3e33025fbaac6d370fc83240340dfae1409 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -6,81 +6,171 @@
 // Created:     24/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Created:     24/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Guilhem Lavaux

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROCESSH__
 #define _WX_PROCESSH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROCESSH__
 #define _WX_PROCESSH__
 

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

     #pragma interface "process.h"
 #endif
 
     #pragma interface "process.h"
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"

 #include "wx/event.h"
 #include "wx/event.h"

-#include "wx/stream.h"

 
 

-// Process Event handling
-class WXDLLEXPORT wxProcessEvent : public wxEvent
-{
-DECLARE_DYNAMIC_CLASS(wxProcessEvent)
-
-public:
-    wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0) : wxEvent(id)
-    {
-        m_eventType = wxEVT_END_PROCESS;
-        m_pid = pid;
-        m_exitcode = exitcode;
-    }
+#if wxUSE_STREAMS
+    #include "wx/stream.h"
+#endif

 
 

-    // accessors
-        // PID of process which terminated
-    int GetPid() { return m_pid; }
+#include "wx/utils.h"       // for wxSignal

 
 

-        // the exit code
-    int GetExitCode() { return m_exitcode; }
+// the wxProcess creation flags
+enum
+{
+    // no redirection
+    wxPROCESS_DEFAULT = 0,

 
 

-public:
-    int m_pid, m_exitcode;
+    // redirect the IO of the child process
+    wxPROCESS_REDIRECT = 1

 };
 
 };
 

+// ----------------------------------------------------------------------------

 // A wxProcess object should be passed to wxExecute - than its OnTerminate()
 // function will be called when the process terminates.
 // A wxProcess object should be passed to wxExecute - than its OnTerminate()
 // function will be called when the process terminates.

-class WXDLLEXPORT wxProcess : public wxEvtHandler
-{
-DECLARE_DYNAMIC_CLASS(wxProcess)
+// ----------------------------------------------------------------------------

 
 

+class WXDLLIMPEXP_BASE wxProcess : public wxEvtHandler
+{

 public:
 public:

-    wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, bool needPipe = FALSE, int id = -1);
-    ~wxProcess();
+    // kill the process with the given PID
+    static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN);
+
+    // test if the given process exists
+    static bool Exists(int pid);
+
+    // this function replaces the standard popen() one: it launches a process
+    // asynchronously and allows the caller to get the streams connected to its
+    // std{in|out|err}
+    //
+    // on error NULL is returned, in any case the process object will be
+    // deleted automatically when the process terminates and should *not* be
+    // deleted by the caller
+    static wxProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC);
+

 
 

+    // ctors
+    wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int nId = wxID_ANY)
+        { Init(parent, nId, wxPROCESS_DEFAULT); }
+
+    wxProcess(int flags) { Init(NULL, wxID_ANY, flags); }
+
+    virtual ~wxProcess();
+
+    // may be overridden to be notified about process termination

     virtual void OnTerminate(int pid, int status);
 
     virtual void OnTerminate(int pid, int status);
 

+    // call this before passing the object to wxExecute() to redirect the
+    // launched process stdin/stdout, then use GetInputStream() and
+    // GetOutputStream() to get access to them
+    void Redirect() { m_redirect = true; }
+    bool IsRedirected() const { return m_redirect; }
+

     // detach from the parent - should be called by the parent if it's deleted
     // before the process it started terminates
     void Detach();
 
     // detach from the parent - should be called by the parent if it's deleted
     // before the process it started terminates
     void Detach();
 

+#if wxUSE_STREAMS

     // Pipe handling
     // Pipe handling

-    wxInputStream *GetInputStream() const;
-    wxOutputStream *GetOutputStream() const;
-
-    // These functions should not be called by the usual user. They are only
-    // intended to be used by wxExecute.
-    // Install pipes
-    void SetPipeStreams(wxInputStream *in_stream, wxOutputStream *out_stream);
-    bool NeedPipe() const;
+    wxInputStream *GetInputStream() const { return m_inputStream; }
+    wxInputStream *GetErrorStream() const { return m_errorStream; }
+    wxOutputStream *GetOutputStream() const { return m_outputStream; }
+
+    // close the output stream indicating that nothing more will be written
+    void CloseOutput() { delete m_outputStream; m_outputStream = NULL; }
+
+    // return true if the child process stdout is not closed
+    bool IsInputOpened() const;
+
+    // return true if any input is available on the child process stdout/err
+    bool IsInputAvailable() const;
+    bool IsErrorAvailable() const;
+
+    // implementation only (for wxExecute)
+    //
+    // NB: the streams passed here should correspond to the child process
+    //     stdout, stdin and stderr and here the normal naming convention is
+    //     used unlike elsewhere in this class
+    void SetPipeStreams(wxInputStream *outStream,
+                        wxOutputStream *inStream,
+                        wxInputStream *errStream);
+#endif // wxUSE_STREAMS
+
+    // for backwards compatibility only, don't use
+#if WXWIN_COMPATIBILITY_2_2
+    wxDEPRECATED( wxProcess(wxEvtHandler *parent, bool redirect) );
+#endif // WXWIN_COMPATIBILITY_2_2

 
 protected:
 
 protected:

+    void Init(wxEvtHandler *parent, int id, int flags);
+

     int m_id;
     int m_id;

-    bool m_needPipe;
-    wxInputStream *m_in_stream;
-    wxOutputStream *m_out_stream;
+
+#if wxUSE_STREAMS
+    // these streams are connected to stdout, stderr and stdin of the child
+    // process respectively (yes, m_inputStream corresponds to stdout -- very
+    // confusing but too late to change now)
+    wxInputStream  *m_inputStream,
+                   *m_errorStream;
+    wxOutputStream *m_outputStream;
+#endif // wxUSE_STREAMS
+
+    bool m_redirect;
+
+    DECLARE_DYNAMIC_CLASS(wxProcess)
+    DECLARE_NO_COPY_CLASS(wxProcess)

 };
 
 };
 

-typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
+// ----------------------------------------------------------------------------
+// wxProcess events
+// ----------------------------------------------------------------------------

 
 

-#define EVT_END_PROCESS(id, func) { wxEVT_END_PROCESS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxProcessEventFunction) & func, NULL},
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, 440)
+END_DECLARE_EVENT_TYPES()

 
 

-#endif
-    // _WX_PROCESSH__
+class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent
+{
+public:
+    wxProcessEvent(int nId = 0, int pid = 0, int exitcode = 0) : wxEvent(nId)
+    {
+        m_eventType = wxEVT_END_PROCESS;
+        m_pid = pid;
+        m_exitcode = exitcode;
+    }
+
+    // accessors
+        // PID of process which terminated
+    int GetPid() { return m_pid; }
+
+        // the exit code
+    int GetExitCode() { return m_exitcode; }
+
+    // implement the base class pure virtual
+    virtual wxEvent *Clone() const { return new wxProcessEvent(*this); }
+
+public:
+    int m_pid,
+        m_exitcode;
+
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxProcessEvent)
+};
+
+typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
+
+#define wxProcessEventHandler(func) \
+    (wxObjectEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func)
+
+#define EVT_END_PROCESS(id, func) \
+   wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))
+
+#endif // _WX_PROCESSH__