X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4453c7082f76f42c222e9b08467e0f7f82616dec..f0fbbe236452ae27a7577deafbbc44ace2c209e7:/src/common/containr.cpp?ds=sidebyside diff --git a/src/common/containr.cpp b/src/common/containr.cpp index 8f41d782f2..06ada8e7a2 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -533,7 +533,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) !m_winLastFocused->HasFlag(wxRB_SINGLE) ) { wxRadioButton * const - lastBtn = wx_static_cast(wxRadioButton *, m_winLastFocused); + lastBtn = static_cast(m_winLastFocused); // cursor keys don't navigate out of a radio button group so // find the correct radio button to focus @@ -566,7 +566,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) } #endif // __WXMSW__ - if ( child->CanAcceptFocus() ) + if ( child->CanAcceptFocusFromKeyboard() ) { // if we're setting the focus to a child panel we should prevent it // from giving it to the child which had the focus the last time