Only define wxUSE_XTEST in Unix-specific headers
This symbol is not needed and doesn't make sense in wxMSW.
This commit is contained in:
@@ -1403,9 +1403,6 @@
|
|||||||
// Compile wxUIActionSimulator class?
|
// Compile wxUIActionSimulator class?
|
||||||
#define wxUSE_UIACTIONSIMULATOR 1
|
#define wxUSE_UIACTIONSIMULATOR 1
|
||||||
|
|
||||||
// Use the XTest extension for wxUIActionSimulator?
|
|
||||||
#define wxUSE_XTEST 1
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxDC classes for various output formats
|
// wxDC classes for various output formats
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -1231,14 +1231,6 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* !defined(wxUSE_XRC) */
|
#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 */
|
#endif /* wxUSE_GUI */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -1404,9 +1404,6 @@
|
|||||||
// Compile wxUIActionSimulator class?
|
// Compile wxUIActionSimulator class?
|
||||||
#define wxUSE_UIACTIONSIMULATOR 1
|
#define wxUSE_UIACTIONSIMULATOR 1
|
||||||
|
|
||||||
// Use the XTest extension for wxUIActionSimulator?
|
|
||||||
#define wxUSE_XTEST 1
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxDC classes for various output formats
|
// wxDC classes for various output formats
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -1404,9 +1404,6 @@
|
|||||||
// Compile wxUIActionSimulator class?
|
// Compile wxUIActionSimulator class?
|
||||||
#define wxUSE_UIACTIONSIMULATOR 1
|
#define wxUSE_UIACTIONSIMULATOR 1
|
||||||
|
|
||||||
// Use the XTest extension for wxUIActionSimulator?
|
|
||||||
#define wxUSE_XTEST 1
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxDC classes for various output formats
|
// wxDC classes for various output formats
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -1404,9 +1404,6 @@
|
|||||||
// Compile wxUIActionSimulator class?
|
// Compile wxUIActionSimulator class?
|
||||||
#define wxUSE_UIACTIONSIMULATOR 1
|
#define wxUSE_UIACTIONSIMULATOR 1
|
||||||
|
|
||||||
// Use the XTest extension for wxUIActionSimulator?
|
|
||||||
#define wxUSE_XTEST 1
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxDC classes for various output formats
|
// wxDC classes for various output formats
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -1405,9 +1405,6 @@
|
|||||||
// Compile wxUIActionSimulator class?
|
// Compile wxUIActionSimulator class?
|
||||||
#define wxUSE_UIACTIONSIMULATOR 1
|
#define wxUSE_UIACTIONSIMULATOR 1
|
||||||
|
|
||||||
// Use the XTest extension for wxUIActionSimulator?
|
|
||||||
#define wxUSE_XTEST 1
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxDC classes for various output formats
|
// wxDC classes for various output formats
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -1400,9 +1400,6 @@
|
|||||||
// Compile wxUIActionSimulator class?
|
// Compile wxUIActionSimulator class?
|
||||||
#define wxUSE_UIACTIONSIMULATOR 1
|
#define wxUSE_UIACTIONSIMULATOR 1
|
||||||
|
|
||||||
// Use the XTest extension for wxUIActionSimulator?
|
|
||||||
#define wxUSE_XTEST 1
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxDC classes for various output formats
|
// wxDC classes for various output formats
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -1403,9 +1403,6 @@
|
|||||||
// Compile wxUIActionSimulator class?
|
// Compile wxUIActionSimulator class?
|
||||||
#define wxUSE_UIACTIONSIMULATOR 1
|
#define wxUSE_UIACTIONSIMULATOR 1
|
||||||
|
|
||||||
// Use the XTest extension for wxUIActionSimulator?
|
|
||||||
#define wxUSE_XTEST 1
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxDC classes for various output formats
|
// wxDC classes for various output formats
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -41,3 +41,11 @@
|
|||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#endif /* wxUSE_GSTREAMER */
|
#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) */
|
||||||
|
12
setup.h.in
12
setup.h.in
@@ -570,8 +570,6 @@
|
|||||||
|
|
||||||
#define wxUSE_UIACTIONSIMULATOR 0
|
#define wxUSE_UIACTIONSIMULATOR 0
|
||||||
|
|
||||||
#define wxUSE_XTEST 0
|
|
||||||
|
|
||||||
|
|
||||||
#define wxUSE_POSTSCRIPT 0
|
#define wxUSE_POSTSCRIPT 0
|
||||||
|
|
||||||
@@ -639,6 +637,16 @@
|
|||||||
|
|
||||||
#define wxUSE_GSTREAMER_PLAYER 0
|
#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 --- */
|
/* --- start MSW options --- */
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user