X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d67974d248156678a45aded725f5b92c69f502a..d94de683a60b20153591cc3f8f52a97cf9ce9453:/src/common/process.cpp diff --git a/src/common/process.cpp b/src/common/process.cpp index 518549e660..36764bf2f5 100644 --- a/src/common/process.cpp +++ b/src/common/process.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "process.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -47,21 +43,13 @@ 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 ) SetNextHandler(parent); m_id = id; + m_pid = 0; m_redirect = (flags & wxPROCESS_REDIRECT) != 0; #if wxUSE_STREAMS @@ -76,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; }