X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fa03f04345b620d1a14529b05961116b20a1297..db7035e48a4ccc6265fa01949cb92db3c6b6c17f:/include/wx/process.h diff --git a/include/wx/process.h b/include/wx/process.h index baaea3e330..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 @@ -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,15 +104,12 @@ public: 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: 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,7 +164,7 @@ public: typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&); #define wxProcessEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func) #define EVT_END_PROCESS(id, func) \ wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))