X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a387938f80a2804f259e7305513231be39620fd2..cc4d5638c66a409e421420ed7110917755a66788:/src/common/process.cpp?ds=sidebyside diff --git a/src/common/process.cpp b/src/common/process.cpp index 36764bf2f5..6dd44d891b 100644 --- a/src/common/process.cpp +++ b/src/common/process.cpp @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: process.cpp +// Name: src/common/process.cpp // Purpose: Process termination classes // Author: Guilhem Lavaux // Modified by: Vadim Zeitlin to check error codes, added Detach() method // Created: 24/06/98 -// RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -30,7 +29,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) @@ -50,6 +49,7 @@ void wxProcess::Init(wxEvtHandler *parent, int id, int flags) m_id = id; m_pid = 0; + m_priority = wxPRIORITY_DEFAULT; m_redirect = (flags & wxPROCESS_REDIRECT) != 0; #if wxUSE_STREAMS @@ -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; } // ---------------------------------------------------------------------------- @@ -162,7 +168,7 @@ bool wxProcess::Exists(int pid) default: case wxKILL_ERROR: case wxKILL_BAD_SIGNAL: - wxFAIL_MSG( _T("unexpected wxProcess::Kill() return code") ); + wxFAIL_MSG( wxT("unexpected wxProcess::Kill() return code") ); // fall through case wxKILL_NO_PROCESS: @@ -170,3 +176,10 @@ bool wxProcess::Exists(int pid) } } +void wxProcess::SetPriority(unsigned priority) +{ + wxCHECK_RET( priority <= wxPRIORITY_MAX, + wxS("Invalid process priority value.") ); + + m_priority = priority; +}