From 8b5387bc3da33f437a53edcb11847802b628eb70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= Date: Tue, 13 Dec 2016 13:35:40 +0100 Subject: [PATCH] Enable wxUSE_ACCESSIBILITY by default (MSW) Compile accessibility support on Windows by default now that the generic wxDataViewCtrl control implements accessible interface. After the changes from 7dab555f7118f24e70444ff6d6411433b730b889, accessibility support is much more lightweight and doesn't interfere with normal win32 behavior, so this change shouldn't affect accessibility-unaware code in any way. --- configure | 4 ++++ configure.in | 4 ++++ include/wx/android/setup.h | 10 +++++++--- include/wx/gtk/setup0.h | 10 +++++++--- include/wx/motif/setup0.h | 10 +++++++--- include/wx/msw/setup0.h | 10 +++++++--- include/wx/osx/setup0.h | 10 +++++++--- include/wx/setup_inc.h | 10 +++++++--- include/wx/univ/setup0.h | 10 +++++++--- setup.h.in | 4 ++++ 10 files changed, 61 insertions(+), 21 deletions(-) diff --git a/configure b/configure index f22f9adb8e..2f72f2abb1 100755 --- a/configure +++ b/configure @@ -11329,6 +11329,10 @@ fi +if test "$wxUSE_MSW" = 1 ; then + DEFAULT_wxUSE_ACCESSIBILITY=yes +fi + enablestring= defaultval=$wxUSE_ALL_FEATURES diff --git a/configure.in b/configure.in index f2ab7eb94a..99e15b4784 100644 --- a/configure.in +++ b/configure.in @@ -970,6 +970,10 @@ dnl --------------------------------------------------------------------------- dnl misc GUI options dnl --------------------------------------------------------------------------- +if test "$wxUSE_MSW" = 1 ; then + DEFAULT_wxUSE_ACCESSIBILITY=yes +fi + WX_ARG_FEATURE(menus, [ --enable-menus use wxMenu/wxMenuBar/wxMenuItem classes], wxUSE_MENUS) WX_ARG_FEATURE(miniframe, [ --enable-miniframe use wxMiniFrame class], wxUSE_MINIFRAME) WX_ARG_FEATURE(tooltips, [ --enable-tooltips use wxToolTip class], wxUSE_TOOLTIPS) diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index ca05367ed4..9e8c35e644 100644 --- a/include/wx/android/setup.h +++ b/include/wx/android/setup.h @@ -1358,12 +1358,16 @@ #define wxUSE_DRAG_AND_DROP 1 // Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. +// Depends on wxUSE_OLE on MSW. // -// Default is 0. +// Default is 1 on MSW, 0 elsewhere. // -// Recommended setting (at present): 0 +// Recommended setting (at present): 1 (MSW-only) +#ifdef __WXMSW__ +#define wxUSE_ACCESSIBILITY 1 +#else #define wxUSE_ACCESSIBILITY 0 +#endif // ---------------------------------------------------------------------------- // miscellaneous settings diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index 89c9de0e25..d66b698478 100644 --- a/include/wx/gtk/setup0.h +++ b/include/wx/gtk/setup0.h @@ -1359,12 +1359,16 @@ #define wxUSE_DRAG_AND_DROP 1 // Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. +// Depends on wxUSE_OLE on MSW. // -// Default is 0. +// Default is 1 on MSW, 0 elsewhere. // -// Recommended setting (at present): 0 +// Recommended setting (at present): 1 (MSW-only) +#ifdef __WXMSW__ +#define wxUSE_ACCESSIBILITY 1 +#else #define wxUSE_ACCESSIBILITY 0 +#endif // ---------------------------------------------------------------------------- // miscellaneous settings diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index b9d39e753c..cf922bc5a8 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -1359,12 +1359,16 @@ #define wxUSE_DRAG_AND_DROP 1 // Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. +// Depends on wxUSE_OLE on MSW. // -// Default is 0. +// Default is 1 on MSW, 0 elsewhere. // -// Recommended setting (at present): 0 +// Recommended setting (at present): 1 (MSW-only) +#ifdef __WXMSW__ +#define wxUSE_ACCESSIBILITY 1 +#else #define wxUSE_ACCESSIBILITY 0 +#endif // ---------------------------------------------------------------------------- // miscellaneous settings diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index ed3f9d89e0..6b4d8bc7dc 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -1359,12 +1359,16 @@ #define wxUSE_DRAG_AND_DROP 1 // Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. +// Depends on wxUSE_OLE on MSW. // -// Default is 0. +// Default is 1 on MSW, 0 elsewhere. // -// Recommended setting (at present): 0 +// Recommended setting (at present): 1 (MSW-only) +#ifdef __WXMSW__ +#define wxUSE_ACCESSIBILITY 1 +#else #define wxUSE_ACCESSIBILITY 0 +#endif // ---------------------------------------------------------------------------- // miscellaneous settings diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index 37ac4ba038..4ba8eb2bf2 100644 --- a/include/wx/osx/setup0.h +++ b/include/wx/osx/setup0.h @@ -1360,12 +1360,16 @@ #define wxUSE_DRAG_AND_DROP 1 // Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. +// Depends on wxUSE_OLE on MSW. // -// Default is 0. +// Default is 1 on MSW, 0 elsewhere. // -// Recommended setting (at present): 0 +// Recommended setting (at present): 1 (MSW-only) +#ifdef __WXMSW__ +#define wxUSE_ACCESSIBILITY 1 +#else #define wxUSE_ACCESSIBILITY 0 +#endif // ---------------------------------------------------------------------------- // miscellaneous settings diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index a383b00ad0..ca8f94bd50 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -1355,12 +1355,16 @@ #define wxUSE_DRAG_AND_DROP 1 // Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. +// Depends on wxUSE_OLE on MSW. // -// Default is 0. +// Default is 1 on MSW, 0 elsewhere. // -// Recommended setting (at present): 0 +// Recommended setting (at present): 1 (MSW-only) +#ifdef __WXMSW__ +#define wxUSE_ACCESSIBILITY 1 +#else #define wxUSE_ACCESSIBILITY 0 +#endif // ---------------------------------------------------------------------------- // miscellaneous settings diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 1222353b7f..42f75c700d 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -1358,12 +1358,16 @@ #define wxUSE_DRAG_AND_DROP 1 // Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. +// Depends on wxUSE_OLE on MSW. // -// Default is 0. +// Default is 1 on MSW, 0 elsewhere. // -// Recommended setting (at present): 0 +// Recommended setting (at present): 1 (MSW-only) +#ifdef __WXMSW__ +#define wxUSE_ACCESSIBILITY 1 +#else #define wxUSE_ACCESSIBILITY 0 +#endif // ---------------------------------------------------------------------------- // miscellaneous settings diff --git a/setup.h.in b/setup.h.in index 23807726dc..0e596334db 100644 --- a/setup.h.in +++ b/setup.h.in @@ -544,7 +544,11 @@ #define wxUSE_DRAG_AND_DROP 0 +#ifdef __WXMSW__ +#define wxUSE_ACCESSIBILITY 1 +#else #define wxUSE_ACCESSIBILITY 0 +#endif #define wxUSE_SNGLINST_CHECKER 0