X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d98817cfab2654773755cb5c540057c5f3d4fd6..7a3c45f2c8932c27485b6cd4d1a0494a2ccf9589:/include/wx/containr.h?ds=sidebyside

diff --git a/include/wx/containr.h b/include/wx/containr.h
index 7cb13e8fc1..a0ce88484f 100644
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -14,6 +14,11 @@
 
 #include "wx/defs.h"
 
+#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
+    // We need wxEVT_XXX declarations in this case.
+    #include "wx/event.h"
+#endif
+
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 
@@ -116,9 +121,6 @@ protected:
 
 #else // !wxHAS_NATIVE_TAB_TRAVERSAL
 
-class WXDLLIMPEXP_FWD_CORE wxFocusEvent;
-class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent;
-
 // ----------------------------------------------------------------------------
 // wxControlContainer for TAB navigation implemented in wx itself
 // ----------------------------------------------------------------------------
@@ -146,7 +148,7 @@ protected:
 #endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL
 
 // this function is for wxWidgets internal use only
-extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
+extern WXDLLIMPEXP_CORE bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
 
 // ----------------------------------------------------------------------------
 // wxNavigationEnabled: Derive from this class to support keyboard navigation
@@ -166,13 +168,13 @@ public:
         m_container.SetContainerWindow(this);
 
 #ifndef wxHAS_NATIVE_TAB_TRAVERSAL
-        Connect(wxEVT_NAVIGATION_KEY,
+        BaseWindowClass::Connect(wxEVT_NAVIGATION_KEY,
                 wxNavigationKeyEventHandler(wxNavigationEnabled::OnNavigationKey));
 
-        Connect(wxEVT_SET_FOCUS,
+        BaseWindowClass::Connect(wxEVT_SET_FOCUS,
                 wxFocusEventHandler(wxNavigationEnabled::OnFocus));
 
-        Connect(wxEVT_CHILD_FOCUS,
+        BaseWindowClass::Connect(wxEVT_CHILD_FOCUS,
                 wxChildFocusEventHandler(wxNavigationEnabled::OnChildFocus));
 #endif // !wxHAS_NATIVE_TAB_TRAVERSAL
     }