From 1ee339eecb8c6554d96e93e5c1c6edd112db5c64 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 12 May 2002 11:25:39 +0000 Subject: [PATCH] made wxIsInsideYield global -- will be fixed when we have some better way to test if we're inside wxYield() from wxApp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/app.cpp | 14 ++++++++------ src/gtk1/app.cpp | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index e3badff237..3f05639ce8 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -87,12 +87,14 @@ void wxExit() // wxYield //----------------------------------------------------------------------------- +// not static because used by textctrl.cpp +// +// MT-FIXME +bool wxIsInsideYield = FALSE; + bool wxApp::Yield(bool onlyIfNeeded) { - // MT-FIXME - static bool s_inYield = FALSE; - - if ( s_inYield ) + if ( wxIsInsideYield ) { if ( !onlyIfNeeded ) { @@ -110,7 +112,7 @@ bool wxApp::Yield(bool onlyIfNeeded) } #endif // wxUSE_THREADS - s_inYield = TRUE; + wxIsInsideYield = TRUE; if (!g_isIdle) { @@ -139,7 +141,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // let the logs be flashed again wxLog::Resume(); - s_inYield = FALSE; + wxIsInsideYield = FALSE; return TRUE; } diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index e3badff237..3f05639ce8 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -87,12 +87,14 @@ void wxExit() // wxYield //----------------------------------------------------------------------------- +// not static because used by textctrl.cpp +// +// MT-FIXME +bool wxIsInsideYield = FALSE; + bool wxApp::Yield(bool onlyIfNeeded) { - // MT-FIXME - static bool s_inYield = FALSE; - - if ( s_inYield ) + if ( wxIsInsideYield ) { if ( !onlyIfNeeded ) { @@ -110,7 +112,7 @@ bool wxApp::Yield(bool onlyIfNeeded) } #endif // wxUSE_THREADS - s_inYield = TRUE; + wxIsInsideYield = TRUE; if (!g_isIdle) { @@ -139,7 +141,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // let the logs be flashed again wxLog::Resume(); - s_inYield = FALSE; + wxIsInsideYield = FALSE; return TRUE; } -- 2.47.2