X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..f1b63efe8993c6c0460354bc2da7331526d43efa:/include/wx/process.h diff --git a/include/wx/process.h b/include/wx/process.h index b61f2a99f0..36e7519bd8 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 @@ -62,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); @@ -101,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 @@ -130,9 +130,9 @@ protected: // wxProcess events // ---------------------------------------------------------------------------- -BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, 440) -END_DECLARE_EVENT_TYPES() +class WXDLLIMPEXP_FWD_BASE wxProcessEvent; + +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, wxProcessEvent ) class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent { @@ -164,7 +164,7 @@ public: typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&); #define wxProcessEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func) + wxEVENT_HANDLER_CAST(wxProcessEventFunction, func) #define EVT_END_PROCESS(id, func) \ wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))