X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e626d7c78771793c08f5c5652f4a2c26f6f196ed..97c58531bf6912d5b6214b4bd6298466ebcb87ca:/include/wx/process.h diff --git a/include/wx/process.h b/include/wx/process.h index 03993984bb..f707116868 100644 --- a/include/wx/process.h +++ b/include/wx/process.h @@ -6,16 +6,12 @@ // Created: 24/06/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PROCESSH__ #define _WX_PROCESSH__ -#ifdef __GNUG__ - #pragma interface "process.h" -#endif - #include "wx/event.h" #if wxUSE_STREAMS @@ -39,11 +35,11 @@ enum // function will be called when the process terminates. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxProcess : public wxEvtHandler +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,6 +84,13 @@ 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 + bool IsInputOpened() const; + + // return true if any input is available on the child process stdout/err + bool IsInputAvailable() const; + bool IsErrorAvailable() const; + // implementation only (for wxExecute) // // NB: the streams passed here should correspond to the child process @@ -98,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); @@ -121,6 +118,7 @@ protected: bool m_redirect; DECLARE_DYNAMIC_CLASS(wxProcess) + DECLARE_NO_COPY_CLASS(wxProcess) }; // ---------------------------------------------------------------------------- @@ -128,13 +126,13 @@ protected: // ---------------------------------------------------------------------------- BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EVENT_TYPE(wxEVT_END_PROCESS, 440) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, 440) END_DECLARE_EVENT_TYPES() -class WXDLLEXPORT wxProcessEvent : public wxEvent +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; @@ -155,17 +153,15 @@ public: int m_pid, m_exitcode; - DECLARE_DYNAMIC_CLASS(wxProcessEvent) + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxProcessEvent) }; 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__