From e82c6194028474759c785fb6eebdcde00e6621c0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 21 May 2016 18:42:49 +0200 Subject: [PATCH] Only define wxUSE_XTEST in Unix-specific headers This symbol is not needed and doesn't make sense in wxMSW. --- include/wx/android/setup.h | 3 --- include/wx/chkconf.h | 8 -------- include/wx/gtk/setup0.h | 3 --- include/wx/motif/setup0.h | 3 --- include/wx/msw/setup0.h | 3 --- include/wx/osx/setup0.h | 3 --- include/wx/setup_inc.h | 3 --- include/wx/univ/setup0.h | 3 --- include/wx/unix/chkconf.h | 8 ++++++++ setup.h.in | 12 ++++++++++-- 10 files changed, 18 insertions(+), 31 deletions(-) diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index 5fe489dd07..5bf57497a3 100644 --- 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 // ---------------------------------------------------------------------------- diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 73d58fe550..0e4814216d 100644 --- 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 */ /* diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index 369bb40902..277c2e4fd8 100644 --- 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 // ---------------------------------------------------------------------------- diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index ec3e107806..75426b39b5 100644 --- 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 // ---------------------------------------------------------------------------- diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 445eaa9cfb..6ccbf11792 100644 --- 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 // ---------------------------------------------------------------------------- diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index 3793f94809..47046eb9a9 100644 --- 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 // ---------------------------------------------------------------------------- diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 6cee4cbed3..4b404fbed1 100644 --- 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 // ---------------------------------------------------------------------------- diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 666d8cae57..10fa48f47e 100644 --- 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 // ---------------------------------------------------------------------------- diff --git a/include/wx/unix/chkconf.h b/include/wx/unix/chkconf.h index b8a1904133..d51d36466d 100644 --- 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) */ diff --git a/setup.h.in b/setup.h.in index fd8bd66ce7..bb8c2f8014 100644 --- 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 --- */