From eacb6b56a63316a310f33dcc4e14ba3e5bc55c63 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 22 Mar 2008 03:48:11 +0000 Subject: [PATCH] extracted GUI-specific part of utilsunx.cpp to a new unix/apptraits.cpp file and don't include utilsunx.cpp in both base and GUI libraries now so that we can get rid of BASE_AND_GUI_UNIX_SRC in files.bkl entirely git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/apptraits.cpp | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 src/unix/apptraits.cpp diff --git a/src/unix/apptraits.cpp b/src/unix/apptraits.cpp new file mode 100644 index 0000000000..b81b55db17 --- /dev/null +++ b/src/unix/apptraits.cpp @@ -0,0 +1,89 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: src/unix/apptraits.cpp +// Purpose: implementation of wxGUIAppTraits for Unix systems +// Author: Vadim Zeitlin +// Created: 2008-03-22 +// RCS-ID: $Id$ +// Copyright: (c) 2008 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP +#endif // WX_PRECOMP + +#include "wx/apptrait.h" +#include "wx/unix/execute.h" + +// ============================================================================ +// implementation +// ============================================================================ + +int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) +{ + const int flags = execData.flags; + if ( !(flags & wxEXEC_SYNC) || (flags & wxEXEC_NOEVENTS) ) + { + // async or blocking sync cases are already handled by the base class + // just fine, no need to duplicate its code here + return wxAppTraits::WaitForChild(execData); + } + + // here we're dealing with the case of synchronous execution when we want + // 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.tag = AddProcessCallback + ( + &endProcData, + execData.pipeEndProcDetect.Detach(wxPipe::Read) + ); + + execData.pipeEndProcDetect.Close(); + + + // prepare to wait for the child termination: show to the user that we're + // busy and refuse all input unless explicitly told otherwise + wxBusyCursor bc; + wxWindowDisabler wd(!(flags & wxEXEC_NODISABLE)); + + // endProcData.pid will be set to 0 from wxHandleProcessTermination() when + // the process terminates + while ( endProcData.pid != 0 ) + { + // don't consume 100% of the CPU while we're sitting in this + // loop + if ( !CheckForRedirectedIO(execData) ) + wxMilliSleep(1); + + // give the toolkit a chance to call wxHandleProcessTermination() here + // and also repaint the GUI and handle other accumulated events + wxYield(); + } + + return endProcData.exitcode; +} + + -- 2.45.2