a hack to fix multiple problems with showing modal dialogs from OnIdle()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-10-22 00:30:26 +00:00
parent e771b7e4ac
commit 8b26aa07de
2 changed files with 19 additions and 5 deletions

View File

@@ -1066,15 +1066,21 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg)
return FALSE;
}
// this is a temporary hack and will be replaced by using wxEventLoop in the
// future
//
// it is needed to allow other event loops (currently only one: the modal
// dialog one) to reset the OnIdle() semaphore because otherwise OnIdle()
// wouldn't do anything while a modal dialog shown from OnIdle() call is shown.
bool wxIsInOnIdleFlag = FALSE;
void wxApp::OnIdle(wxIdleEvent& event)
{
static bool s_inOnIdle = FALSE;
// Avoid recursion (via ProcessEvent default case)
if ( s_inOnIdle )
if ( wxIsInOnIdleFlag )
return;
s_inOnIdle = TRUE;
wxIsInOnIdleFlag = TRUE;
// If there are pending events, we must process them: pending events
// are either events to the threads other than main or events posted
@@ -1109,7 +1115,7 @@ void wxApp::OnIdle(wxIdleEvent& event)
event.RequestMore(TRUE);
}
s_inOnIdle = FALSE;
wxIsInOnIdleFlag = FALSE;
}
// Send idle event to all top-level windows

View File

@@ -247,6 +247,12 @@ void wxDialog::DoShowModal()
m_windowDisabler = new wxWindowDisabler(this);
// before entering the modal loop, reset the "is in OnIdle()" flag (see
// comment in app.cpp)
extern bool wxIsInOnIdleFlag;
bool wasInOnIdle = wxIsInOnIdleFlag;
wxIsInOnIdleFlag = FALSE;
// enter the modal loop
while ( IsModalShowing() )
{
@@ -261,6 +267,8 @@ void wxDialog::DoShowModal()
wxTheApp->DoMessage();
}
wxIsInOnIdleFlag = wasInOnIdle;
// and restore focus
// Note that this code MUST NOT access the dialog object's data
// in case the object has been deleted (which will be the case