Include wx/containr.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 6146b45ac6ebd9cea626f27099fac1d2ab714bfa..020bc20ca1223c6a59baad20e283822bc44d08f6 100644 (file)
--- 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"
     #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"
     #include "wx/scrolbar.h"

-#endif
-
-#ifdef __WXMSW__

     #include "wx/radiobut.h"
     #include "wx/radiobut.h"

-#endif
+    #include "wx/containr.h"
+#endif //WX_PRECOMP

 
 // trace mask for focus messages
 #define TRACE_FOCUS _T("focus")
 
 // trace mask for focus messages
 #define TRACE_FOCUS _T("focus")


@@ -369,7 +362,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
     for ( ;; )
     {
         // don't go into infinite loop
     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?
             break;
 
         // Have we come to the last or first item on the panel?


@@ -646,4 +639,3 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 
     return false;
 }
 
     return false;
 }

-