Applied patch [ 1211219 ] Build fix for configurations without wxUSE_LOG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -136,9 +136,11 @@ bool wxApp::Yield(bool onlyIfNeeded)
|
|||||||
// never finish.
|
// never finish.
|
||||||
wxTheApp->RemoveIdleTag();
|
wxTheApp->RemoveIdleTag();
|
||||||
|
|
||||||
|
#if wxUSE_LOG
|
||||||
// disable log flushing from here because a call to wxYield() shouldn't
|
// disable log flushing from here because a call to wxYield() shouldn't
|
||||||
// normally result in message boxes popping up &c
|
// normally result in message boxes popping up &c
|
||||||
wxLog::Suspend();
|
wxLog::Suspend();
|
||||||
|
#endif
|
||||||
|
|
||||||
while (gtk_events_pending())
|
while (gtk_events_pending())
|
||||||
gtk_main_iteration();
|
gtk_main_iteration();
|
||||||
@@ -151,8 +153,10 @@ bool wxApp::Yield(bool onlyIfNeeded)
|
|||||||
// return value of Processidle().
|
// return value of Processidle().
|
||||||
ProcessIdle();
|
ProcessIdle();
|
||||||
|
|
||||||
|
#if wxUSE_LOG
|
||||||
// let the logs be flashed again
|
// let the logs be flashed again
|
||||||
wxLog::Resume();
|
wxLog::Resume();
|
||||||
|
#endif
|
||||||
|
|
||||||
wxIsInsideYield = FALSE;
|
wxIsInsideYield = FALSE;
|
||||||
|
|
||||||
|
@@ -136,9 +136,11 @@ bool wxApp::Yield(bool onlyIfNeeded)
|
|||||||
// never finish.
|
// never finish.
|
||||||
wxTheApp->RemoveIdleTag();
|
wxTheApp->RemoveIdleTag();
|
||||||
|
|
||||||
|
#if wxUSE_LOG
|
||||||
// disable log flushing from here because a call to wxYield() shouldn't
|
// disable log flushing from here because a call to wxYield() shouldn't
|
||||||
// normally result in message boxes popping up &c
|
// normally result in message boxes popping up &c
|
||||||
wxLog::Suspend();
|
wxLog::Suspend();
|
||||||
|
#endif
|
||||||
|
|
||||||
while (gtk_events_pending())
|
while (gtk_events_pending())
|
||||||
gtk_main_iteration();
|
gtk_main_iteration();
|
||||||
@@ -151,8 +153,10 @@ bool wxApp::Yield(bool onlyIfNeeded)
|
|||||||
// return value of Processidle().
|
// return value of Processidle().
|
||||||
ProcessIdle();
|
ProcessIdle();
|
||||||
|
|
||||||
|
#if wxUSE_LOG
|
||||||
// let the logs be flashed again
|
// let the logs be flashed again
|
||||||
wxLog::Resume();
|
wxLog::Resume();
|
||||||
|
#endif
|
||||||
|
|
||||||
wxIsInsideYield = FALSE;
|
wxIsInsideYield = FALSE;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user