X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/process.h diff --git a/include/wx/process.h b/include/wx/process.h index 4c3b1b1c74..f707116868 100644 --- a/include/wx/process.h +++ b/include/wx/process.h @@ -12,10 +12,6 @@ #ifndef _WX_PROCESSH__ #define _WX_PROCESSH__ -#if defined(__GNUG__) && !defined(__APPLE__) - #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); @@ -59,10 +55,10 @@ public: // ctors - wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1) - { Init(parent, id, wxPROCESS_DEFAULT); } + wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int nId = wxID_ANY) + { Init(parent, nId, wxPROCESS_DEFAULT); } - wxProcess(int flags) { Init(NULL, -1, flags); } + wxProcess(int flags) { Init(NULL, wxID_ANY, flags); } virtual ~wxProcess(); @@ -72,7 +68,7 @@ public: // call this before passing the object to wxExecute() to redirect the // launched process stdin/stdout, then use GetInputStream() and // GetOutputStream() to get access to them - void Redirect() { m_redirect = TRUE; } + void Redirect() { m_redirect = true; } bool IsRedirected() const { return m_redirect; } // detach from the parent - should be called by the parent if it's deleted @@ -88,10 +84,10 @@ public: // close the output stream indicating that nothing more will be written void CloseOutput() { delete m_outputStream; m_outputStream = NULL; } - // return TRUE if the child process stdout is not closed + // return true if the child process stdout is not closed bool IsInputOpened() const; - // return TRUE if any input is available on the child process stdout/err + // return true if any input is available on the child process stdout/err bool IsInputAvailable() const; bool IsErrorAvailable() const; @@ -105,12 +101,6 @@ 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, -1, redirect ? wxPROCESS_REDIRECT : wxPROCESS_DEFAULT); } -#endif // WXWIN_COMPATIBILITY_2_2 - protected: void Init(wxEvtHandler *parent, int id, int flags); @@ -142,7 +132,7 @@ END_DECLARE_EVENT_TYPES() class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent { public: - wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0) : wxEvent(id) + wxProcessEvent(int nId = 0, int pid = 0, int exitcode = 0) : wxEvent(nId) { m_eventType = wxEVT_END_PROCESS; m_pid = pid; @@ -168,12 +158,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, -1, \ - (wxObjectEventFunction) \ - (wxEventFunction) \ - (wxProcessEventFunction) & func, NULL), + wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func)) -#endif - // _WX_PROCESSH__ +#endif // _WX_PROCESSH__