X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eacb6b56a63316a310f33dcc4e14ba3e5bc55c63..2bc4cc1ead29f6de1f0576a416025edadb13d7cc:/src/unix/apptraits.cpp diff --git a/src/unix/apptraits.cpp b/src/unix/apptraits.cpp index b81b55db17..a2698eef66 100644 --- a/src/unix/apptraits.cpp +++ b/src/unix/apptraits.cpp @@ -23,10 +23,12 @@ #pragma hdrstop #endif +#include "wx/apptrait.h" + #ifndef WX_PRECOMP + #include "wx/utils.h" #endif // WX_PRECOMP -#include "wx/apptrait.h" #include "wx/unix/execute.h" // ============================================================================ @@ -47,21 +49,13 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) // to process the GUI events while waiting for the child termination wxEndProcessData endProcData; - - // we may have process for capturing the program output, but it's - // not used in wxEndProcessData in the case of sync execution - endProcData.process = NULL; - - // sync execution: indicate it by negating the pid - endProcData.pid = -execData.pid; - + endProcData.pid = execData.pid; endProcData.tag = AddProcessCallback ( &endProcData, - execData.pipeEndProcDetect.Detach(wxPipe::Read) + execData.GetEndProcReadFD() ); - - execData.pipeEndProcDetect.Close(); + endProcData.async = false; // prepare to wait for the child termination: show to the user that we're