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
This commit is contained in:
parent
9d3845e884
commit
eacb6b56a6
89
src/unix/apptraits.cpp
Normal file
89
src/unix/apptraits.cpp
Normal file
@ -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 <vadim@wxwindows.org>
|
||||||
|
// 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user