Avoid accidental enabling of disabled windows by checking for disabled parent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -405,11 +405,25 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
|
|||||||
return true ;
|
return true ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 ( !AcceptsFocus() )
|
if ( !AcceptsFocus() )
|
||||||
return ;
|
return ;
|
||||||
|
|
||||||
|
if (wxIsWindowOrParentDisabled((wxWindow*) this))
|
||||||
|
return;
|
||||||
|
|
||||||
wxWindow* former = FindFocus() ;
|
wxWindow* former = FindFocus() ;
|
||||||
if ( former == this )
|
if ( former == this )
|
||||||
return ;
|
return ;
|
||||||
|
Reference in New Issue
Block a user