Only define wxUSE_XTEST in Unix-specific headers

This symbol is not needed and doesn't make sense in wxMSW.
2016-05-21 18:42:49 +02:00
parent 54a6c44a77
commit e82c619402
10 changed files with 18 additions and 31 deletions
--- a/include/wx/android/setup.h
+++ b/include/wx/android/setup.h
@@ -1403,9 +1403,6 @@
 // Compile wxUIActionSimulator class?
 #define wxUSE_UIACTIONSIMULATOR 1

-// Use the XTest extension for wxUIActionSimulator?
-#define wxUSE_XTEST 1
-
 // ----------------------------------------------------------------------------
 // wxDC classes for various output formats
 // ----------------------------------------------------------------------------
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1231,14 +1231,6 @@
 #   endif
 #endif /* !defined(wxUSE_XRC) */

-#ifndef wxUSE_XTEST
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_XTEST must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_XTEST 0
-#   endif
-#endif /* !defined(wxUSE_XTEST) */
-
 #endif /* wxUSE_GUI */

 /*
--- a/include/wx/gtk/setup0.h
+++ b/include/wx/gtk/setup0.h
@@ -1404,9 +1404,6 @@
 // Compile wxUIActionSimulator class?
 #define wxUSE_UIACTIONSIMULATOR 1

-// Use the XTest extension for wxUIActionSimulator?
-#define wxUSE_XTEST 1
-
 // ----------------------------------------------------------------------------
 // wxDC classes for various output formats
 // ----------------------------------------------------------------------------
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -1404,9 +1404,6 @@
 // Compile wxUIActionSimulator class?
 #define wxUSE_UIACTIONSIMULATOR 1

-// Use the XTest extension for wxUIActionSimulator?
-#define wxUSE_XTEST 1
-
 // ----------------------------------------------------------------------------
 // wxDC classes for various output formats
 // ----------------------------------------------------------------------------
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1404,9 +1404,6 @@
 // Compile wxUIActionSimulator class?
 #define wxUSE_UIACTIONSIMULATOR 1

-// Use the XTest extension for wxUIActionSimulator?
-#define wxUSE_XTEST 1
-
 // ----------------------------------------------------------------------------
 // wxDC classes for various output formats
 // ----------------------------------------------------------------------------
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -1405,9 +1405,6 @@
 // Compile wxUIActionSimulator class?
 #define wxUSE_UIACTIONSIMULATOR 1

-// Use the XTest extension for wxUIActionSimulator?
-#define wxUSE_XTEST 1
-
 // ----------------------------------------------------------------------------
 // wxDC classes for various output formats
 // ----------------------------------------------------------------------------
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -1400,9 +1400,6 @@
 // Compile wxUIActionSimulator class?
 #define wxUSE_UIACTIONSIMULATOR 1

-// Use the XTest extension for wxUIActionSimulator?
-#define wxUSE_XTEST 1
-
 // ----------------------------------------------------------------------------
 // wxDC classes for various output formats
 // ----------------------------------------------------------------------------
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -1403,9 +1403,6 @@
 // Compile wxUIActionSimulator class?
 #define wxUSE_UIACTIONSIMULATOR 1

-// Use the XTest extension for wxUIActionSimulator?
-#define wxUSE_XTEST 1
-
 // ----------------------------------------------------------------------------
 // wxDC classes for various output formats
 // ----------------------------------------------------------------------------
--- a/include/wx/unix/chkconf.h
+++ b/include/wx/unix/chkconf.h
@@ -41,3 +41,11 @@
 #       endif
 #   endif
 #endif /* wxUSE_GSTREAMER */
+
+#ifndef wxUSE_XTEST
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XTEST must be defined, please read comment near the top of this file."
+#   else
+#       define wxUSE_XTEST 0
+#   endif
+#endif /* !defined(wxUSE_XTEST) */
--- a/setup.h.in
+++ b/setup.h.in
@@ -570,8 +570,6 @@

 #define wxUSE_UIACTIONSIMULATOR 0

-#define wxUSE_XTEST 0
-

 #define wxUSE_POSTSCRIPT  0

@@ -639,6 +637,16 @@

 #define wxUSE_GSTREAMER_PLAYER 0

+/*
+   Use XTest extension to implement wxUIActionSimulator?
+
+   Default is 1, it is set to 0 if the necessary headers/libraries are not
+   found by configure.
+
+   Recommended setting: 1, wxUIActionSimulator won't work in wxGTK3 without it.
+ */
+#define wxUSE_XTEST 0
+
 /* --- start MSW options --- */