Added --enable-accessibility switch to configure
(off by default). Fixed makefile for the accessibility sample. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
a538c1c36f
commit
7bb2947d52
12
configure.in
12
configure.in
@ -482,6 +482,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_IFF=no
|
||||
DEFAULT_wxUSE_XPM=no
|
||||
DEFAULT_wxUSE_ICO_CUR=no
|
||||
DEFAULT_wxUSE_ACCESSIBILITY=no
|
||||
else
|
||||
DEFAULT_wxUSE_UNIVERSAL=no
|
||||
|
||||
@ -654,6 +655,7 @@ else
|
||||
DEFAULT_wxUSE_PNM=yes
|
||||
DEFAULT_wxUSE_XPM=yes
|
||||
DEFAULT_wxUSE_ICO_CUR=yes
|
||||
DEFAULT_wxUSE_ACCESSIBILITY=no
|
||||
fi
|
||||
|
||||
dnl WX_ARG_WITH should be used to select whether an external package will be
|
||||
@ -1053,6 +1055,7 @@ WX_ARG_ENABLE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUS
|
||||
WX_ARG_ENABLE(joystick, [ --enable-joystick use wxJoystick (Linux only)], wxUSE_JOYSTICK)
|
||||
WX_ARG_ENABLE(metafile, [ --enable-metafiles use wxMetaFile (Windows only)], wxUSE_METAFILE)
|
||||
WX_ARG_ENABLE(dragimage, [ --enable-dragimage use wxDragImage], wxUSE_DRAGIMAGE)
|
||||
WX_ARG_ENABLE(accessibility,[ --enable-accessibility enable accessibility support], wxUSE_ACCESSIBILITY)
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl support for image formats that do not rely on external library
|
||||
@ -2066,6 +2069,10 @@ if test "$USE_WIN32" = 1 ; then
|
||||
dnl --- some of them should probably be included conditionally.
|
||||
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
|
||||
|
||||
if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
|
||||
LIBS="$LIBS -loleacc"
|
||||
fi
|
||||
|
||||
case "${host}" in
|
||||
*-*-cygwin* )
|
||||
dnl Cygwin doesn't include these by default
|
||||
@ -5149,6 +5156,11 @@ if test "$wxUSE_DRAGIMAGE" = "yes"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_ACCESSIBILITY" = "yes"; then
|
||||
AC_DEFINE(wxUSE_ACCESSIBILITY)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MENUS" = "yes"; then
|
||||
AC_DEFINE(wxUSE_MENUS)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
|
||||
|
@ -7,11 +7,11 @@
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile for accesstest example (UNIX).
|
||||
# Makefile for access example (UNIX).
|
||||
|
||||
top_srcdir = @top_srcdir@/..
|
||||
top_builddir = ../..
|
||||
program_dir = samples/accesstest
|
||||
program_dir = samples/access
|
||||
|
||||
PROGRAM=accesstest
|
||||
|
||||
|
2
samples/configure
vendored
2
samples/configure
vendored
@ -656,6 +656,7 @@ ac_given_srcdir=$srcdir
|
||||
|
||||
trap 'rm -fr `echo "
|
||||
Makefile
|
||||
access/Makefile
|
||||
artprov/Makefile
|
||||
caret/Makefile
|
||||
calendar/Makefile
|
||||
@ -812,6 +813,7 @@ EOF
|
||||
cat >> $CONFIG_STATUS <<EOF
|
||||
|
||||
CONFIG_FILES=\${CONFIG_FILES-"Makefile
|
||||
access/Makefile
|
||||
artprov/Makefile
|
||||
caret/Makefile
|
||||
calendar/Makefile
|
||||
|
@ -26,6 +26,7 @@ AC_SUBST(WX_TARGET_LIBRARY_GL)
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
access/Makefile
|
||||
artprov/Makefile
|
||||
caret/Makefile
|
||||
calendar/Makefile
|
||||
|
@ -329,6 +329,11 @@
|
||||
*/
|
||||
#define wxUSE_DRAGIMAGE 0
|
||||
|
||||
/*
|
||||
* Enable accessibility support
|
||||
*/
|
||||
#define wxUSE_ACCESSIBILITY 0
|
||||
|
||||
/*
|
||||
* Use property sheet classes
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user