fix keyboard navigation in radio boxes containing hidden or disabled items

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/radiobox.h

@@ -49,7 +49,8 @@ public:
     unsigned int GetColumnCount() const { return m_numCols; }
     unsigned int GetRowCount() const { return m_numRows; }
 
-    // return the item above/below/to the left/right of the given one
+    // return the next active (i.e. shown and not disabled) item above/below/to
+    // the left/right of the given one
     int GetNextItem(int item, wxDirection dir, long style) const;
 
 #if wxUSE_TOOLTIPS

src/common/radiocmn.cpp

@@ -64,12 +64,16 @@ void wxRadioBoxBase::SetMajorDim(unsigned int majorDim, long style)
 
 int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
 {
+    const int itemStart = item;
+
     int count = GetCount(),
         numCols = GetColumnCount(),
         numRows = GetRowCount();
 
     bool horz = (style & wxRA_SPECIFY_COLS) != 0;
 
+    do
+    {
         switch ( dir )
         {
             case wxUP:
@@ -128,12 +132,13 @@ int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
         // ensure that the item is in range [0..count)
         if ( item < 0 )
         {
-        // first map the item to the one in the same column but in the last row
+            // first map the item to the one in the same column but in the last
+            // row
             item += count;
 
-        // now there are 2 cases: either it is the first item of the last row
+            // now there are 2 cases: either it is the first item of the last
-        // in which case we need to wrap again and get to the last item or we
+            // row in which case we need to wrap again and get to the last item
-        // can just go to the previous item
+            // or we can just go to the previous item
             if ( item % (horz ? numCols : numRows) )
                 item--;
             else
@@ -144,8 +149,8 @@ int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
             // same logic as above
             item -= count;
 
-        // ... except that we need to check if this is not the last item, not
+            // ... except that we need to check if this is not the last item,
-        // the first one
+            // not the first one
             if ( (item + 1) % (horz ? numCols : numRows) )
                 item++;
             else
@@ -154,6 +159,11 @@ int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
 
         wxASSERT_MSG( item < count && item >= 0,
                       _T("logic error in wxRadioBox::GetNextItem()") );
+    }
+    // we shouldn't select the non-active items, continue looking for a
+    // visible and shown one unless we came back to the item we started from in
+    // which case bail out to avoid infinite loop
+    while ( !(IsItemShown(item) && IsItemEnabled(item)) && item != itemStart );
 
     return item;
 }