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

Avoid accidental enabling of disabled windows by checking for disabled parent

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@61091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-06-17 16:32:56 +00:00
parent 436dccde70
commit eb10b04a3a
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mac/carbon/window.cpp
View File

@@ -1381,6 +1381,17 @@ bool wxWindowMac::MacCanFocus() const
} }
} }
static bool wxIsWindowOrParentDisabled(wxWindow* w)
{
while (w && !w->IsTopLevel())
{
if (!w->IsEnabled())
return true;
w = w->GetParent();
}
return false;
}
void wxWindowMac::SetFocus() void wxWindowMac::SetFocus()
{ {
if ( m_peer == NULL ) if ( m_peer == NULL )
@@ -1389,6 +1400,9 @@ void wxWindowMac::SetFocus()
if ( !AcceptsFocus() ) if ( !AcceptsFocus() )
return ; return ;
if (wxIsWindowOrParentDisabled(this))
return;
wxWindow* former = FindFocus() ; wxWindow* former = FindFocus() ;
if ( former == this ) if ( former == this )
return ; return ;