X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afd7bf26f1cf319020fc789f3afcdcb98c9b549b..d819fba8aed9bb1bdbfa72867223835bb28e3a8e:/src/common/containr.cpp diff --git a/src/common/containr.cpp b/src/common/containr.cpp index 42aa660a50..d465bc0511 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -71,11 +71,9 @@ bool wxControlContainer::AcceptsFocus() const node = node->GetNext(); #ifdef __WXMAC__ - wxScrollBar *sb = wxDynamicCast( child , wxScrollBar ) ; - if ( sb == NULL || !m_winParent->MacIsWindowScrollbar( sb ) ) - hasRealChildren = true ; - if ( sb && m_winParent->MacIsWindowScrollbar( sb ) ) + if ( m_winParent->MacIsWindowScrollbar( child ) ) continue; + hasRealChildren = true ; #endif if ( child->AcceptsFocus() ) { @@ -641,8 +639,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) node = node->GetNext(); #ifdef __WXMAC__ - wxScrollBar *sb = wxDynamicCast( child , wxScrollBar ) ; - if ( sb && child->GetParent()->MacIsWindowScrollbar( sb ) ) + if ( child->GetParent()->MacIsWindowScrollbar( child ) ) continue; #endif