From: Julian Smart Date: Mon, 30 May 2005 09:08:49 +0000 (+0000) Subject: Applied patch [ 1211219 ] Build fix for configurations without wxUSE_LOG X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dd7641ef10e8abdb37bca41740c047eef1846400 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 --- diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 8932e2198d..4d25eb73de 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -136,9 +136,11 @@ bool wxApp::Yield(bool onlyIfNeeded) // never finish. wxTheApp->RemoveIdleTag(); +#if wxUSE_LOG // disable log flushing from here because a call to wxYield() shouldn't // normally result in message boxes popping up &c wxLog::Suspend(); +#endif while (gtk_events_pending()) gtk_main_iteration(); @@ -151,8 +153,10 @@ bool wxApp::Yield(bool onlyIfNeeded) // return value of Processidle(). ProcessIdle(); +#if wxUSE_LOG // let the logs be flashed again wxLog::Resume(); +#endif wxIsInsideYield = FALSE; diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 8932e2198d..4d25eb73de 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -136,9 +136,11 @@ bool wxApp::Yield(bool onlyIfNeeded) // never finish. wxTheApp->RemoveIdleTag(); +#if wxUSE_LOG // disable log flushing from here because a call to wxYield() shouldn't // normally result in message boxes popping up &c wxLog::Suspend(); +#endif while (gtk_events_pending()) gtk_main_iteration(); @@ -151,8 +153,10 @@ bool wxApp::Yield(bool onlyIfNeeded) // return value of Processidle(). ProcessIdle(); +#if wxUSE_LOG // let the logs be flashed again wxLog::Resume(); +#endif wxIsInsideYield = FALSE;