X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f542367b72dd900a914c163df7f23ca5e79a60c..841f23e18a9d9e3d987b60422c3a220571868337:/src/common/containr.cpp?ds=sidebyside diff --git a/src/common/containr.cpp b/src/common/containr.cpp index 72f8634104..020bc20ca1 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -28,17 +28,10 @@ #include "wx/log.h" #include "wx/event.h" #include "wx/window.h" -#endif //WX_PRECOMP - -#include "wx/containr.h" - -#ifdef __WXMAC__ #include "wx/scrolbar.h" -#endif - -#ifdef __WXMSW__ #include "wx/radiobut.h" -#endif + #include "wx/containr.h" +#endif //WX_PRECOMP // trace mask for focus messages #define TRACE_FOCUS _T("focus") @@ -185,8 +178,8 @@ wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn) // no more buttons in group return NULL; } - else - return prevBtn; + + return prevBtn; } wxRadioButton* wxGetNextButtonInGroup(wxRadioButton *btn) @@ -215,8 +208,8 @@ wxRadioButton* wxGetNextButtonInGroup(wxRadioButton *btn) // no more buttons or the first button of the next group return NULL; } - else - return nextBtn; + + return nextBtn; } wxRadioButton* wxGetFirstButtonInGroup(wxRadioButton *btn) @@ -231,6 +224,18 @@ wxRadioButton* wxGetFirstButtonInGroup(wxRadioButton *btn) } } +wxRadioButton* wxGetLastButtonInGroup(wxRadioButton *btn) +{ + while (true) + { + wxRadioButton* nextBtn = wxGetNextButtonInGroup(btn); + if (!nextBtn) + return btn; + + btn = nextBtn; + } +} + wxRadioButton* wxGetSelectedButtonInGroup(wxRadioButton *btn) { // Find currently selected button @@ -290,7 +295,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) } // where are we going? - bool forward = event.GetDirection(); + const bool forward = event.GetDirection(); // the node of the children list from which we should start looking for the // next acceptable child @@ -307,11 +312,8 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) // start from first or last depending on where we're going node = forward ? children.GetFirst() : children.GetLast(); - - // we want to cycle over all nodes - start_node = wxWindowList::compatibility_iterator(); } - else + else // going up { // try to find the child which has the focus currently @@ -337,10 +339,6 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) // ok, we found the focus - now is it our child? start_node = children.Find( winFocus ); } - else - { - start_node = wxWindowList::compatibility_iterator(); - } if ( !start_node && m_winLastFocused ) { @@ -361,14 +359,24 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) } // we want to cycle over all elements passing by NULL - while ( node != start_node ) + for ( ;; ) { + // don't go into infinite loop + if ( start_node && node && node == start_node ) + break; + // Have we come to the last or first item on the panel? if ( !node ) { + if ( !start_node ) + { + // exit now as otherwise we'd loop forever + break; + } + if ( !goingDown ) { - // Check if our (may be grand) parent is another panel: if this + // Check if our (maybe grand) parent is another panel: if this // is the case, they will know what to do with this navigation // key and so give them the chance to process it instead of // looping inside this panel (normally, the focus will go to @@ -402,39 +410,62 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) wxWindow *child = node->GetData(); #ifdef __WXMSW__ - bool canSelectRadioButton = true; - if (!event.IsFromTab()) + if ( event.IsFromTab() ) { - // If navigating using cursor keys, make sure not to navigate out of a radio button group. - if (m_winLastFocused && wxIsKindOf(m_winLastFocused, wxRadioButton)) + if ( wxIsKindOf(child, wxRadioButton) ) { - if (!wxIsKindOf(child, wxRadioButton)) + // only radio buttons with either wxRB_GROUP or wxRB_SINGLE + // can be tabbed to + if ( child->HasFlag(wxRB_GROUP) ) { - child = forward ? - wxGetNextButtonInGroup((wxRadioButton*)m_winLastFocused) : - wxGetPreviousButtonInGroup((wxRadioButton*)m_winLastFocused); - if (!child) - { - event.Skip(false); - return; - } + // need to tab into the active button within a group + wxRadioButton *rb = wxGetSelectedButtonInGroup((wxRadioButton*)child); + if ( rb ) + child = rb; + } + else if ( !child->HasFlag(wxRB_SINGLE) ) + { + node = forward ? node->GetNext() : node->GetPrevious(); + continue; } } } - else + else if ( m_winLastFocused && + wxIsKindOf(m_winLastFocused, wxRadioButton) && + !m_winLastFocused->HasFlag(wxRB_SINGLE) ) { - // If navigating using tabs, skip all but the first radio button in a group. - if (wxIsKindOf(child, wxRadioButton)) + // cursor keys don't navigate out of a radio button group so + // find the correct radio button to focus + if ( forward ) + { + child = wxGetNextButtonInGroup((wxRadioButton*)m_winLastFocused); + if ( !child ) + { + // no next button in group, set it to the first button + child = wxGetFirstButtonInGroup((wxRadioButton*)m_winLastFocused); + } + } + else { - if (wxGetPreviousButtonInGroup((wxRadioButton*)child)) - canSelectRadioButton = false; + child = wxGetPreviousButtonInGroup((wxRadioButton*)m_winLastFocused); + if ( !child ) + { + // no previous button in group, set it to the last button + child = wxGetLastButtonInGroup((wxRadioButton*)m_winLastFocused); + } + } + + if ( child == m_winLastFocused ) + { + // must be a group consisting of only one button therefore + // no need to send a navigation event + event.Skip(false); + return; } } -#else - static bool canSelectRadioButton = true; -#endif +#endif // __WXMSW__ - if ( child->AcceptsFocusFromKeyboard() && canSelectRadioButton ) + if ( child->AcceptsFocusFromKeyboard() ) { // 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 @@ -442,18 +473,6 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) // direction we're coming event.SetEventObject(m_winParent); -#if defined(__WXMSW__) - // we need to hop to the next activated - // radio button, not just the next radio - // button under MSW - if (wxIsKindOf(child, wxRadioButton) && event.IsFromTab()) - { - wxRadioButton *rb = wxGetSelectedButtonInGroup((wxRadioButton*)child); - if (rb) - child = rb; - } -#endif // __WXMSW__ - // disable propagation for this call as otherwise the event might // bounce back to us. wxPropagationDisabler disableProp(event); @@ -620,4 +639,3 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) return false; } -