more fixes to OnHelp() to avoid infinite recursion when handling help events

[wxWidgets.git] / src / common / containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 6146b45ac6ebd9cea626f27099fac1d2ab714bfa..700d9eb782df27545b9c194ba7faf93ba8d2f610 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -28,18 +28,12 @@
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/window.h"
+    #include "wx/scrolbar.h"
+    #include "wx/radiobut.h"
 #endif //WX_PRECOMP
 
 #include "wx/containr.h"
 
-#ifdef __WXMAC__
-    #include "wx/scrolbar.h"
-#endif
-
-#ifdef __WXMSW__
-    #include "wx/radiobut.h"
-#endif
-
 // trace mask for focus messages
 #define TRACE_FOCUS _T("focus")
 
@@ -369,7 +363,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 +640,3 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 
     return false;
 }
-