Avoid accidental enabling of disabled windows by checking for disabled parent
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:
@@ -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()
|
||||
{
|
||||
if ( m_peer == NULL )
|
||||
@@ -1389,6 +1400,9 @@ void wxWindowMac::SetFocus()
|
||||
if ( !AcceptsFocus() )
|
||||
return ;
|
||||
|
||||
if (wxIsWindowOrParentDisabled(this))
|
||||
return;
|
||||
|
||||
wxWindow* former = FindFocus() ;
|
||||
if ( former == this )
|
||||
return ;
|
||||
|
Reference in New Issue
Block a user