X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d67974d248156678a45aded725f5b92c69f502a..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/process.h diff --git a/include/wx/process.h b/include/wx/process.h index 6b54ca0a67..2f1027ae64 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 @@ -59,13 +55,16 @@ public: // ctors - wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int nId = wxID_ANY) + wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) { Init(parent, nId, wxPROCESS_DEFAULT); } wxProcess(int flags) { Init(NULL, wxID_ANY, flags); } 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,17 @@ 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 + // implementation only - don't use! + // -------------------------------- + + // needs to be public since it needs to be used from wxExecute() global func + void SetPid(long pid) { m_pid = pid; } protected: void Init(wxEvtHandler *parent, int id, int flags); int m_id; + long m_pid; #if wxUSE_STREAMS // these streams are connected to stdout, stderr and stdin of the child @@ -127,16 +128,16 @@ protected: bool m_redirect; DECLARE_DYNAMIC_CLASS(wxProcess) - DECLARE_NO_COPY_CLASS(wxProcess) + wxDECLARE_NO_COPY_CLASS(wxProcess); }; // ---------------------------------------------------------------------------- // 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 { @@ -167,10 +168,10 @@ public: typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&); +#define wxProcessEventHandler(func) \ + wxEVENT_HANDLER_CAST(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__