Add wxUSE_PREFERENCES_EDITOR and the corresponding configure option.

This was somehow forgotten when wxPreferencesEditor was added.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-15 15:14:59 +00:00
parent ccf8bf20ca
commit a94529575a
17 changed files with 189 additions and 2 deletions

54
configure vendored
View File

@@ -1288,6 +1288,7 @@ enable_notebook
enable_notifmsg
enable_odcombobox
enable_popupwin
enable_prefseditor
enable_radiobox
enable_radiobtn
enable_richmsgdlg
@@ -2222,6 +2223,7 @@ Optional Features:
--enable-notifmsg use wxNotificationMessage class
--enable-odcombobox use wxOwnerDrawnComboBox class
--enable-popupwin use wxPopUpWindow class
--enable-prefseditor use wxPreferencesEditor class
--enable-radiobox use wxRadioBox class
--enable-radiobtn use wxRadioButton class
--enable-richmsgdlg use wxRichMessageDialog class
@@ -13035,6 +13037,50 @@ fi
$as_echo "$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
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-prefseditor" >&5
$as_echo_n "checking for --${enablestring:-enable}-prefseditor... " >&6; }
# Check whether --enable-prefseditor was given.
if test "${enable_prefseditor+set}" = set; then :
enableval=$enable_prefseditor;
if test "$enableval" = yes; then
wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=yes'
else
wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=no'
fi
else
wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=${'DEFAULT_wxUSE_PREFERENCES_EDITOR":-$defaultval}"
fi
eval "$wx_cv_use_prefseditor"
if test x"$enablestring" = xdisable; then
if test $wxUSE_PREFERENCES_EDITOR = no; then
result=yes
else
result=no
fi
else
result=$wxUSE_PREFERENCES_EDITOR
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
$as_echo "$result" >&6; }
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
@@ -36642,6 +36688,12 @@ $as_echo "$as_me: WARNING: wxPopupWindow not yet supported under PM... disabled"
fi
fi
if test "$wxUSE_PREFERENCES_EDITOR" = "yes"; then
$as_echo "#define wxUSE_PREFERENCES_EDITOR 1" >>confdefs.h
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS prefseditor"
fi
if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Dialup manager not supported on this platform... disabled" >&5
@@ -37745,7 +37797,7 @@ if test "$wxUSE_GUI" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
erase event exec font image minimal preferences render \
erase event exec font image minimal render \
shaped svg taborder vscroll widgets wrapsizer"
if test "$wxUSE_MONOLITHIC" != "yes"; then