Accepts Focus was incorrectly returning FALSE for a panel w/o children on mac because of the two implicit scrollbars...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -61,6 +61,12 @@ bool wxControlContainer::AcceptsFocus() const
|
|||||||
if ( !node )
|
if ( !node )
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
|
#ifdef __WXMAC__
|
||||||
|
// wxMac has eventually the two scrollbars as children, they don't count
|
||||||
|
// as real children in the algorithm mentioned above
|
||||||
|
bool hasRealChildren = false ;
|
||||||
|
#endif
|
||||||
|
|
||||||
while ( node )
|
while ( node )
|
||||||
{
|
{
|
||||||
wxWindow *child = node->GetData();
|
wxWindow *child = node->GetData();
|
||||||
@@ -70,8 +76,18 @@ bool wxControlContainer::AcceptsFocus() const
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __WXMAC__
|
||||||
|
wxScrollBar *sb = wxDynamicCast( child , wxScrollBar ) ;
|
||||||
|
if ( sb == NULL || !m_winParent->MacIsWindowScrollbar( sb ) )
|
||||||
|
hasRealChildren = true ;
|
||||||
|
#endif
|
||||||
node = node->GetNext();
|
node = node->GetNext();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __WXMAC__
|
||||||
|
if ( !hasRealChildren )
|
||||||
|
return TRUE ;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
Reference in New Issue
Block a user