X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edc0a395c60f72a065d451778d64969739bf9534..25b34b267ec6878c04add03e874986673fa0f19f:/src/common/containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 55b6109a9b..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")
@@ -369,12 +362,18 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
     for ( ;; )
     {
         // don't go into infinite loop
-        if ( start_node && node == start_node )
+        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 (maybe grand) parent is another panel: if this
@@ -640,4 +639,3 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 
     return false;
 }
-