use a common m_isInsideYield flag instead of static booleans in all ports; add a IsYielding() test which can help to fix unwanted re-entrancies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1015,10 +1015,7 @@ int wxApp::GetShell32Version()
|
||||
|
||||
bool wxApp::Yield(bool onlyIfNeeded)
|
||||
{
|
||||
// MT-FIXME
|
||||
static bool s_inYield = false;
|
||||
|
||||
if ( s_inYield )
|
||||
if ( m_isInsideYield )
|
||||
{
|
||||
if ( !onlyIfNeeded )
|
||||
{
|
||||
@@ -1029,8 +1026,8 @@ bool wxApp::Yield(bool onlyIfNeeded)
|
||||
}
|
||||
|
||||
// set the flag and don't forget to reset it before returning
|
||||
s_inYield = true;
|
||||
wxON_BLOCK_EXIT_SET(s_inYield, false);
|
||||
m_isInsideYield = true;
|
||||
wxON_BLOCK_EXIT_SET(m_isInsideYield, false);
|
||||
|
||||
|
||||
#if wxUSE_LOG
|
||||
|
Reference in New Issue
Block a user