Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed warnings from ipcbase.cpp

Browse Source 
Removed extra wxYields from progress dialog
Yield on wxX11 yields twice


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-09-01 17:02:36 +00:00
parent a679468530
commit bbcd408aa7
5 changed files with 52 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/x11/app.cpp
View File

@@ -1174,46 +1174,53 @@ void wxExit()
bool wxApp::Yield(bool onlyIfNeeded)
{
bool s_inYield = FALSE;
if ( s_inYield )
// Sometimes only 2 yields seem
// to do the trick, e.g. in the
// progress dialog
int i;
for (i = 0; i < 2; i++)
{
if ( !onlyIfNeeded )
bool s_inYield = FALSE;
if ( s_inYield )
{
wxFAIL_MSG( wxT("wxYield called recursively" ) );
if ( !onlyIfNeeded )
{
wxFAIL_MSG( wxT("wxYield called recursively" ) );
}
return FALSE;
}
return FALSE;
}
s_inYield = TRUE;
s_inYield = TRUE;
// Make sure we have an event loop object,
// or Pending/Dispatch will fail
wxEventLoop* eventLoop = wxEventLoop::GetActive();
wxEventLoop* newEventLoop = NULL;
if (!eventLoop)
{
newEventLoop = new wxEventLoop;
wxEventLoop::SetActive(newEventLoop);
}
// Make sure we have an event loop object,
// or Pending/Dispatch will fail
wxEventLoop* eventLoop = wxEventLoop::GetActive();
wxEventLoop* newEventLoop = NULL;
if (!eventLoop)
{
newEventLoop = new wxEventLoop;
wxEventLoop::SetActive(newEventLoop);
}
while (wxTheApp && wxTheApp->Pending())
wxTheApp->Dispatch();
while (wxTheApp && wxTheApp->Pending())
wxTheApp->Dispatch();
#if wxUSE_TIMER
wxTimer::NotifyTimers();
wxTimer::NotifyTimers();
#endif
ProcessIdle();
ProcessIdle();
if (newEventLoop)
{
wxEventLoop::SetActive(NULL);
delete newEventLoop;
if (newEventLoop)
{
wxEventLoop::SetActive(NULL);
delete newEventLoop;
}
s_inYield = FALSE;
}
s_inYield = FALSE;
return TRUE;
}