X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcb68102796280b3e54979ae95738089914ce842..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/process.h diff --git a/include/wx/process.h b/include/wx/process.h index adefc2620a..298a209b8c 100644 --- a/include/wx/process.h +++ b/include/wx/process.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: process.h +// Name: wx/process.h // Purpose: wxProcess class // Author: Guilhem Lavaux // Modified by: Vadim Zeitlin to check error codes, added Detach() method @@ -12,10 +12,6 @@ #ifndef _WX_PROCESSH__ #define _WX_PROCESSH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "process.h" -#endif - #include "wx/event.h" #if wxUSE_STREAMS @@ -43,7 +39,7 @@ class WXDLLIMPEXP_BASE wxProcess : public wxEvtHandler { public: // kill the process with the given PID - static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM); + static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN); // test if the given process exists static bool Exists(int pid); @@ -66,6 +62,9 @@ public: virtual ~wxProcess(); + // get the process ID of the process executed by Open() + long GetPid() const { return m_pid; } + // may be overridden to be notified about process termination virtual void OnTerminate(int pid, int status); @@ -105,16 +104,12 @@ public: wxInputStream *errStream); #endif // wxUSE_STREAMS - // for backwards compatibility only, don't use -#if WXWIN_COMPATIBILITY_2_2 - wxProcess(wxEvtHandler *parent, bool redirect) - { Init(parent, wxID_ANY, redirect ? wxPROCESS_REDIRECT : wxPROCESS_DEFAULT); } -#endif // WXWIN_COMPATIBILITY_2_2 - protected: void Init(wxEvtHandler *parent, int id, int flags); + void SetPid(long pid) { m_pid = pid; } int m_id; + long m_pid; #if wxUSE_STREAMS // these streams are connected to stdout, stderr and stdin of the child @@ -168,10 +163,10 @@ public: typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&); +#define wxProcessEventHandler(func) \ + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func) + #define EVT_END_PROCESS(id, func) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_END_PROCESS, id, wxID_ANY, \ - (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxProcessEventFunction, & func ), NULL), + wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func)) -#endif - // _WX_PROCESSH__ +#endif // _WX_PROCESSH__