Add wxUSE_UIACTIONSIMULATOR and turn it off by default.
Disable the recently added wxUIActionSimulator class until the issues with it mentioned at http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/119792/ are fixed. Also use "" around wx headers instead of <> in wx code itself. See #11801. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
53
configure
vendored
53
configure
vendored
@@ -1883,6 +1883,7 @@ Optional Features:
|
||||
--enable-metafiles use wxMetaFile (Win32 only)
|
||||
--enable-dragimage use wxDragImage
|
||||
--enable-accessibility enable accessibility support
|
||||
--enable-uiactionsim use wxUIActionSimulator (experimental)
|
||||
--enable-palette use wxPalette class
|
||||
--enable-image use wxImage class
|
||||
--enable-gif use gif images (GIF file format)
|
||||
@@ -2969,6 +2970,7 @@ DEFAULT_wxUSE_LIBSDL=no
|
||||
DEFAULT_wxUSE_ACCESSIBILITY=no
|
||||
DEFAULT_wxUSE_IPV6=no
|
||||
DEFAULT_wxUSE_GSTREAMER8=no
|
||||
DEFAULT_wxUSE_UIACTIONSIMULATOR=no
|
||||
|
||||
DEFAULT_wxUSE_UNICODE_UTF8=auto
|
||||
DEFAULT_wxUSE_OPENGL=auto
|
||||
@@ -13557,6 +13559,50 @@ fi
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=$wxUSE_ALL_FEATURES
|
||||
if test -z "$defaultval"; then
|
||||
if test x"$enablestring" = xdisable; then
|
||||
defaultval=yes
|
||||
else
|
||||
defaultval=no
|
||||
fi
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-uiactionsim" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-uiactionsim... $ECHO_C" >&6; }
|
||||
# Check whether --enable-uiactionsim was given.
|
||||
if test "${enable_uiactionsim+set}" = set; then
|
||||
enableval=$enable_uiactionsim;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=yes'
|
||||
else
|
||||
wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=${'DEFAULT_wxUSE_UIACTIONSIMULATOR":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_uiactionsim"
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_UIACTIONSIMULATOR = no; then
|
||||
result=yes
|
||||
else
|
||||
result=no
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_UIACTIONSIMULATOR
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
|
||||
|
||||
enablestring=
|
||||
@@ -46306,6 +46352,13 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_UIACTIONSIMULATOR 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
USES_CONTROLS=0
|
||||
if test "$wxUSE_CONTROLS" = "yes"; then
|
||||
|
Reference in New Issue
Block a user