diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 0ab07916f1..93245b674d 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -233,9 +233,12 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
     }
 }
 
+#endif // !wxHAS_NATIVE_TAB_TRAVERSAL
+
 // --------------------------------------------------------------------
 // The following four functions are used to find other radio buttons
-// within the same group. Used by wxSetFocusToChild
+// within the same group. Used by wxSetFocusToChild() and to implement
+// wxRadioButtonBase public API.
 // --------------------------------------------------------------------
 
 #if wxUSE_RADIOBTN
@@ -357,6 +360,8 @@ using namespace wxPrivate;
 
 #endif // wxUSE_RADIOBTN
 
+#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
+
 // ----------------------------------------------------------------------------
 // Keyboard handling - this is the place where the TAB traversal logic is
 // implemented. As this code is common to all ports, this ensures consistent