Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed (rare but fatal) bug in wxWindowDisabler

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-03-12 00:49:42 +00:00
parent cbc66a2704
commit 79f585d903
1 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/common/utilscmn.cpp
View File

@@ -962,32 +962,8 @@ void wxEnableTopLevelWindows(bool enable)
node->GetData()->Enable(enable); node->GetData()->Enable(enable);
} }
static void wxFindDisabledWindows(wxWindowList& winDisabled,
wxWindow *win,
wxWindow *winToSkip)
{
wxWindowList::Node *node;
for ( node = win->GetChildren().GetFirst(); node; node = node->GetNext() )
{
wxWindow *child = node->GetData();
if ( child == winToSkip )
continue;
wxFindDisabledWindows(winDisabled, child, winToSkip);
if ( child->IsEnabled() )
{
winDisabled.Append(child);
child->Disable();
}
}
}
wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip) wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
{ {
// remember all windows we're going to (temporarily) disable
m_winDisabled = new wxWindowList;
#ifdef __WXMSW__ #ifdef __WXMSW__
#ifdef __WIN32__ #ifdef __WIN32__
// and the top level window too // and the top level window too
@@ -999,16 +975,29 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
#endif #endif
#endif // MSW #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; wxWindowList::Node *node;
for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
{ {
wxWindow *winTop = node->GetData(); wxWindow *winTop = node->GetData();
if ( winTop != winToSkip && winTop->IsEnabled() ) if ( winTop == winToSkip )
continue;
if ( winTop->IsEnabled() )
{ {
wxFindDisabledWindows(*m_winDisabled, winTop, winToSkip); winTop->Disable();
}
else
{
if ( !m_winDisabled )
{
m_winDisabled = new wxWindowList;
}
m_winDisabled->Append(winTop); m_winDisabled->Append(winTop);
winTop->Disable();
} }
} }
} }
@@ -1016,9 +1005,14 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
wxWindowDisabler::~wxWindowDisabler() wxWindowDisabler::~wxWindowDisabler()
{ {
wxWindowList::Node *node; 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; delete m_winDisabled;