X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..f5a1953b341d16396763bee067ccdd96108f3aad:/src/common/process.cpp diff --git a/src/common/process.cpp b/src/common/process.cpp index 43dfcdf867..518549e660 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,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "process.h" #endif @@ -47,6 +47,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent) // wxProcess creation // ---------------------------------------------------------------------------- +#if WXWIN_COMPATIBILITY_2_2 + +wxProcess::wxProcess(wxEvtHandler *parent, bool redirect) +{ + Init(parent, wxID_ANY, redirect ? wxPROCESS_REDIRECT : wxPROCESS_DEFAULT); +} + +#endif // WXWIN_COMPATIBILITY_2_2 + void wxProcess::Init(wxEvtHandler *parent, int id, int flags) { if ( parent ) @@ -142,10 +151,10 @@ bool wxProcess::IsErrorAvailable() const // ---------------------------------------------------------------------------- /* 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; } @@ -157,7 +166,7 @@ bool wxProcess::Exists(int pid) { case wxKILL_OK: case wxKILL_ACCESS_DENIED: - return TRUE; + return true; default: case wxKILL_ERROR: @@ -166,7 +175,7 @@ bool wxProcess::Exists(int pid) // fall through case wxKILL_NO_PROCESS: - return FALSE; + return false; } }