X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/feb6cde446a73ac2fe9ea0528d6c6eb16cc040fd..c437b3f4e47b74715a2f2385d4862972babd7802:/src/common/process.cpp?ds=inline diff --git a/src/common/process.cpp b/src/common/process.cpp index 7c23c47620..26e14c560e 100644 --- a/src/common/process.cpp +++ b/src/common/process.cpp @@ -6,7 +6,7 @@ // Created: 24/06/98 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "process.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -34,7 +30,7 @@ // event tables and such // ---------------------------------------------------------------------------- -DEFINE_EVENT_TYPE(wxEVT_END_PROCESS) +wxDEFINE_EVENT( wxEVT_END_PROCESS, wxProcessEvent ); IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent) @@ -53,6 +49,7 @@ void wxProcess::Init(wxEvtHandler *parent, int id, int flags) SetNextHandler(parent); m_id = id; + m_pid = 0; m_redirect = (flags & wxPROCESS_REDIRECT) != 0; #if wxUSE_STREAMS @@ -67,13 +64,16 @@ wxProcess *wxProcess::Open(const wxString& cmd, int flags) { wxASSERT_MSG( !(flags & wxEXEC_SYNC), wxT("wxEXEC_SYNC should not be used." )); wxProcess *process = new wxProcess(wxPROCESS_REDIRECT); - if ( !wxExecute(cmd, flags, process) ) + long pid = wxExecute(cmd, flags, process); + if( !pid ) { // couldn't launch the process delete process; return NULL; } + process->SetPid(pid); + return process; } @@ -102,7 +102,13 @@ void wxProcess::OnTerminate(int pid, int status) void wxProcess::Detach() { - SetNextHandler(NULL); + // we just detach from the next handler of the chain (i.e. our "parent" -- see ctor) + // not also from the previous handler like wxEvtHandler::Unlink() would do: + + if (m_nextHandler) + m_nextHandler->SetPreviousHandler(m_previousHandler); + + m_nextHandler = NULL; } // ---------------------------------------------------------------------------- @@ -120,6 +126,21 @@ void wxProcess::SetPipeStreams(wxInputStream *inputSstream, m_outputStream = outputStream; } +bool wxProcess::IsInputOpened() const +{ + return m_inputStream && m_inputStream->GetLastError() != wxSTREAM_EOF; +} + +bool wxProcess::IsInputAvailable() const +{ + return m_inputStream && m_inputStream->CanRead(); +} + +bool wxProcess::IsErrorAvailable() const +{ + return m_errorStream && m_errorStream->CanRead(); +} + #endif // wxUSE_STREAMS // ---------------------------------------------------------------------------- @@ -127,10 +148,10 @@ void wxProcess::SetPipeStreams(wxInputStream *inputSstream, // ---------------------------------------------------------------------------- /* static */ -wxKillError wxProcess::Kill(int pid, wxSignal sig) +wxKillError wxProcess::Kill(int pid, wxSignal sig, int flags) { wxKillError rc; - (void)wxKill(pid, sig, &rc); + (void)wxKill(pid, sig, &rc, flags); return rc; } @@ -142,7 +163,7 @@ bool wxProcess::Exists(int pid) { case wxKILL_OK: case wxKILL_ACCESS_DENIED: - return TRUE; + return true; default: case wxKILL_ERROR: @@ -151,7 +172,7 @@ bool wxProcess::Exists(int pid) // fall through case wxKILL_NO_PROCESS: - return FALSE; + return false; } }