compilation fix for recent commit

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

diff --git a/include/wx/process.h b/include/wx/process.h
index d0bff5c627cd4d2c79509571476f38af3e46174d..91c71032ebd3b171e7ceb3f40af4b9917ffeaf05 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -16,40 +16,13 @@
     #pragma interface "process.h"
 #endif
 
     #pragma interface "process.h"
 #endif
 

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

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

-#include "wx/stream.h"
+    #include "wx/stream.h"

 #endif
 
 #endif
 

-// ----------------------------------------------------------------------------
-// wxProcessEvent: event used with wxProcess
-// ----------------------------------------------------------------------------
-
-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;
-    }
-
-    // accessors
-        // PID of process which terminated
-    int GetPid() { return m_pid; }
-
-        // the exit code
-    int GetExitCode() { return m_exitcode; }
-
-public:
-    int m_pid, m_exitcode;
-};
+#include "wx/utils.h"       // for wxSignal

 
 // ----------------------------------------------------------------------------
 // A wxProcess object should be passed to wxExecute - than its OnTerminate()
 
 // ----------------------------------------------------------------------------
 // A wxProcess object should be passed to wxExecute - than its OnTerminate()


@@ -58,8 +31,6 @@ public:
 
 class WXDLLEXPORT wxProcess : public wxEvtHandler
 {
 
 class WXDLLEXPORT wxProcess : public wxEvtHandler
 {

-DECLARE_DYNAMIC_CLASS(wxProcess)
-

 public:
     wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1)
         { Init(parent, id, FALSE); }
 public:
     wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1)
         { Init(parent, id, FALSE); }


@@ -96,6 +67,12 @@ public:
                         wxInputStream *errStream);
 #endif // wxUSE_STREAMS
 
                         wxInputStream *errStream);
 #endif // wxUSE_STREAMS
 

+    // kill the process with the given PID
+    static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM);
+
+    // test if the given process exists
+    static bool Exists(int pid);
+

 protected:
     void Init(wxEvtHandler *parent, int id, bool redirect);
 
 protected:
     void Init(wxEvtHandler *parent, int id, bool redirect);
 


@@ -108,6 +85,8 @@ protected:
 #endif // wxUSE_STREAMS
 
     bool m_redirect;
 #endif // wxUSE_STREAMS
 
     bool m_redirect;

+
+    DECLARE_DYNAMIC_CLASS(wxProcess)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -118,10 +97,41 @@ BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_END_PROCESS, 440)
 END_DECLARE_EVENT_TYPES()
 
     DECLARE_EVENT_TYPE(wxEVT_END_PROCESS, 440)
 END_DECLARE_EVENT_TYPES()
 

-typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
+class WXDLLEXPORT wxProcessEvent : public wxEvent
+{
+public:
+    wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0) : wxEvent(id)
+    {
+        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(wxProcessEvent)
+};
+
+typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);

 
 #define EVT_END_PROCESS(id, func) \
 
 #define EVT_END_PROCESS(id, func) \

-   DECLARE_EVENT_TABLE_ENTRY( wxEVT_END_PROCESS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxProcessEventFunction) & func, NULL),
+   DECLARE_EVENT_TABLE_ENTRY( \
+           wxEVT_END_PROCESS, id, -1, \
+           (wxObjectEventFunction) \
+           (wxEventFunction) \
+           (wxProcessEventFunction) & func, NULL),

 
 #endif
     // _WX_PROCESSH__
 
 #endif
     // _WX_PROCESSH__