X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e547f7a7b87ef1290fbbf3eeeac24665043a9f73..eaba6eba3a1ca393e6ecbafa601cc3b54e705901:/src/common/containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 6146b45ac6..6869269051 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -28,14 +28,11 @@
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/window.h"
+    #include "wx/scrolbar.h"
 #endif //WX_PRECOMP
 
 #include "wx/containr.h"
 
-#ifdef __WXMAC__
-    #include "wx/scrolbar.h"
-#endif
-
 #ifdef __WXMSW__
     #include "wx/radiobut.h"
 #endif
@@ -369,7 +366,7 @@ 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?
@@ -646,4 +643,3 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 
     return false;
 }
-