#endif // __MWERKS__
// ----------------------------------------------------------------------------
-// misc functions
+// wxSafeYield and supporting functions
// ----------------------------------------------------------------------------
void wxEnableTopLevelWindows(bool enable)
node->GetData()->Enable(enable);
}
-static void wxFindDisabledWindows(wxWindowList& winDisabled, wxWindow *win)
-{
- wxWindowList::Node *node;
- for ( node = win->GetChildren().GetFirst(); node; node = node->GetNext() )
- {
- wxWindow *child = node->GetData();
- wxFindDisabledWindows(winDisabled, child);
-
- if ( child->IsEnabled() )
- {
- winDisabled.Append(child);
- child->Disable();
- }
- }
-}
-
wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
{
- // remember all windows we're going to (temporarily) disable
- m_winDisabled = new wxWindowList;
-
#ifdef __WXMSW__
#ifdef __WIN32__
// and the top level window too
#endif
#endif // MSW
+ // remember the top level windows which were already disabled, so that we
+ // don't reenable them later
+ m_winDisabled = NULL;
+
wxWindowList::Node *node;
for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
{
wxWindow *winTop = node->GetData();
+ if ( winTop == winToSkip )
+ continue;
+
if ( winTop->IsEnabled() )
{
- wxFindDisabledWindows(*m_winDisabled, winTop);
-
- m_winDisabled->Append(winTop);
winTop->Disable();
}
- }
+ else
+ {
+ if ( !m_winDisabled )
+ {
+ m_winDisabled = new wxWindowList;
+ }
- if ( winToSkip && m_winDisabled->Find(winToSkip) )
- {
- // always enable ourselves
- m_winDisabled->DeleteObject(winToSkip);
- winToSkip->Enable();
+ m_winDisabled->Append(winTop);
+ }
}
}
wxWindowDisabler::~wxWindowDisabler()
{
wxWindowList::Node *node;
- for ( node = m_winDisabled->GetFirst(); node; node = node->GetNext() )
+ for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
{
- node->GetData()->Enable();
+ wxWindow *winTop = node->GetData();
+ if ( !m_winDisabled || !m_winDisabled->Find(winTop) )
+ {
+ winTop->Enable();
+ }
+ //else: had been already disabled, don't reenable
}
delete m_winDisabled;
return rc;
}
+// ----------------------------------------------------------------------------
+// misc functions
+// ----------------------------------------------------------------------------
+
// Don't synthesize KeyUp events holding down a key and producing KeyDown
// events with autorepeat. On by default and always on in wxMSW. wxGTK version
// in utilsgtk.cpp.