added new and improved wxFileCtrl implementation (patch 1763164)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
69
configure
vendored
69
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 48647 2007-09-13 05:42:42Z PC .
|
||||
# From configure.in Id: configure.in 48648 2007-09-13 06:24:14Z PC .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@@ -1782,6 +1782,7 @@ Optional Features:
|
||||
--enable-detect_sm use code to detect X11 session manager
|
||||
--enable-editablebox use wxEditableListBox class
|
||||
--enable-filepicker use wxFilePickerCtrl class
|
||||
--enable-filectrl use wxFileCtrl class
|
||||
--enable-fontpicker use wxFontPickerCtrl class
|
||||
--enable-gauge use wxGauge class
|
||||
--enable-grid use wxGrid class
|
||||
@@ -10911,6 +10912,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
|
||||
DEFAULT_wxUSE_DISPLAY=yes
|
||||
DEFAULT_wxUSE_DETECT_SM=yes
|
||||
DEFAULT_wxUSE_DIRPICKERCTRL=yes
|
||||
DEFAULT_wxUSE_FILECTRL=yes
|
||||
DEFAULT_wxUSE_FILEPICKERCTRL=yes
|
||||
DEFAULT_wxUSE_FONTPICKERCTRL=yes
|
||||
DEFAULT_wxUSE_GAUGE=yes
|
||||
@@ -10964,6 +10966,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
|
||||
DEFAULT_wxUSE_DISPLAY=no
|
||||
DEFAULT_wxUSE_DETECT_SM=no
|
||||
DEFAULT_wxUSE_DIRPICKERCTRL=no
|
||||
DEFAULT_wxUSE_FILECTRL=no
|
||||
DEFAULT_wxUSE_FILEPICKERCTRL=no
|
||||
DEFAULT_wxUSE_FONTPICKERCTRL=no
|
||||
DEFAULT_wxUSE_GAUGE=no
|
||||
@@ -12177,6 +12180,62 @@ 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}-filectrl" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-filectrl... $ECHO_C" >&6; }
|
||||
# Check whether --enable-filectrl was given.
|
||||
if test "${enable_filectrl+set}" = set; then
|
||||
enableval=$enable_filectrl;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_filectrl='wxUSE_FILECTRL=yes'
|
||||
else
|
||||
wx_cv_use_filectrl='wxUSE_FILECTRL=no'
|
||||
fi
|
||||
cache=yes
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "^wxUSE_FILECTRL=" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
cache=yes
|
||||
else
|
||||
cache=no
|
||||
fi
|
||||
|
||||
wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_filectrl"
|
||||
if test "x$cache" = xyes; then
|
||||
echo "wxUSE_FILECTRL=$wxUSE_FILECTRL" >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_FILECTRL = yes; then
|
||||
result=no
|
||||
else
|
||||
result=yes
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_FILECTRL
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=$wxUSE_ALL_FEATURES
|
||||
if test -z "$defaultval"; then
|
||||
@@ -47842,6 +47901,14 @@ _ACEOF
|
||||
USES_CONTROLS=1
|
||||
fi
|
||||
|
||||
if test "$wxUSE_FILECTRL" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_FILECTRL 1
|
||||
_ACEOF
|
||||
|
||||
USES_CONTROLS=1
|
||||
fi
|
||||
|
||||
if test "$wxUSE_FILEPICKERCTRL" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_FILEPICKERCTRL 1
|
||||
|
Reference in New Issue
Block a user