X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..38534f596974042130716a26276e9564b0b72295:/include/wx/process.h diff --git a/include/wx/process.h b/include/wx/process.h index b61f2a99f0..5a893a7ed5 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 @@ -55,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); @@ -101,15 +104,28 @@ 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 + // priority + // Sets the priority to the given value: see wxPRIORITY_XXX constants. + // + // NB: the priority can only be set before the process is created + void SetPriority(unsigned priority); + + // Get the current priority. + unsigned GetPriority() const { return m_priority; } + + // 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; + + unsigned m_priority; #if wxUSE_STREAMS // these streams are connected to stdout, stderr and stdin of the child @@ -123,16 +139,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 { @@ -164,7 +180,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))