define wxHAS_NATIVE_TAB_TRAVERSAL in wx/features.h; include wx/defs.h from wx/contain...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/containr.h b/include/wx/containr.h
index 6eaa5d7e322e1c323a8c1f9c1b401653d3dd5492..551c7c63f1aca18cd1b2cc1fa642311f8f07be8f 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -13,6 +13,8 @@
 #ifndef _WX_CONTAINR_H_
 #define _WX_CONTAINR_H_
 
 #ifndef _WX_CONTAINR_H_
 #define _WX_CONTAINR_H_
 

+#include "wx/defs.h"
+

 #ifdef wxHAS_NATIVE_TAB_TRAVERSAL
 
 #define WX_DECLARE_CONTROL_CONTAINER() \
 #ifdef wxHAS_NATIVE_TAB_TRAVERSAL
 
 #define WX_DECLARE_CONTROL_CONTAINER() \

diff --git a/include/wx/features.h b/include/wx/features.h
index 637a50e77ce216be98a5d8a4f90d2ed88e29bd26..13fb102e924cc67cb9d294a308cc80fe33562b96 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -66,5 +66,11 @@
     #define wxHAS_UTF8_FONTS
 #endif
 
     #define wxHAS_UTF8_FONTS
 #endif
 

+/* This is defined when the underlying toolkit handles tab traversal natively.
+   Otherwise we implement it ourselves in wxControlContainer. */
+#ifdef __WXGTK20__
+    #define wxHAS_NATIVE_TAB_TRAVERSAL
+#endif
+

 #endif /*  _WX_FEATURES_H_ */
 
 #endif /*  _WX_FEATURES_H_ */
 

diff --git a/include/wx/window.h b/include/wx/window.h
index 0a704011a7d4ec119c9df70b26e8dbda52b115a4..2dde62f41fe18e06dd5d7fd6dcc4113be83618c0 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -62,12 +62,6 @@
     #define wxHAS_NATIVE_ENABLED_MANAGEMENT
 #endif
 
     #define wxHAS_NATIVE_ENABLED_MANAGEMENT
 #endif
 

-// This is defined when the underlying toolkit handles tab traversal natively
-// (currently this only works under GTK+ 2)
-#ifdef __WXGTK20__
-    #define wxHAS_NATIVE_TAB_TRAVERSAL
-#endif
-

 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------