Added configure flag for wxDataViewCtrl.
Currently defaults to "no". git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
55
configure
vendored
55
configure
vendored
@@ -981,6 +981,7 @@ Optional Features:
|
|||||||
--enable-display use wxDisplay class
|
--enable-display use wxDisplay class
|
||||||
--enable-gauge use wxGauge class
|
--enable-gauge use wxGauge class
|
||||||
--enable-grid use wxGrid class
|
--enable-grid use wxGrid class
|
||||||
|
--enable-dataviewctrl, use wxDataViewCtrl class
|
||||||
--enable-imaglist use wxImageList class
|
--enable-imaglist use wxImageList class
|
||||||
--enable-listbook use wxListbook class
|
--enable-listbook use wxListbook class
|
||||||
--enable-listbox use wxListBox class
|
--enable-listbox use wxListBox class
|
||||||
@@ -2186,6 +2187,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
|||||||
DEFAULT_wxUSE_DISPLAY=no
|
DEFAULT_wxUSE_DISPLAY=no
|
||||||
DEFAULT_wxUSE_GAUGE=no
|
DEFAULT_wxUSE_GAUGE=no
|
||||||
DEFAULT_wxUSE_GRID=no
|
DEFAULT_wxUSE_GRID=no
|
||||||
|
DEFAULT_wxUSE_DATAVIEWCTRL=no
|
||||||
DEFAULT_wxUSE_IMAGLIST=no
|
DEFAULT_wxUSE_IMAGLIST=no
|
||||||
DEFAULT_wxUSE_LISTBOOK=no
|
DEFAULT_wxUSE_LISTBOOK=no
|
||||||
DEFAULT_wxUSE_LISTBOX=no
|
DEFAULT_wxUSE_LISTBOX=no
|
||||||
@@ -2385,6 +2387,7 @@ else
|
|||||||
DEFAULT_wxUSE_DISPLAY=yes
|
DEFAULT_wxUSE_DISPLAY=yes
|
||||||
DEFAULT_wxUSE_GAUGE=yes
|
DEFAULT_wxUSE_GAUGE=yes
|
||||||
DEFAULT_wxUSE_GRID=yes
|
DEFAULT_wxUSE_GRID=yes
|
||||||
|
DEFAULT_wxUSE_DATAVIEWCTRL=no
|
||||||
DEFAULT_wxUSE_IMAGLIST=yes
|
DEFAULT_wxUSE_IMAGLIST=yes
|
||||||
DEFAULT_wxUSE_LISTBOOK=yes
|
DEFAULT_wxUSE_LISTBOOK=yes
|
||||||
DEFAULT_wxUSE_LISTBOX=yes
|
DEFAULT_wxUSE_LISTBOX=yes
|
||||||
@@ -7407,6 +7410,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
|
|||||||
DEFAULT_wxUSE_DATEPICKCTRL=yes
|
DEFAULT_wxUSE_DATEPICKCTRL=yes
|
||||||
DEFAULT_wxUSE_GAUGE=yes
|
DEFAULT_wxUSE_GAUGE=yes
|
||||||
DEFAULT_wxUSE_GRID=yes
|
DEFAULT_wxUSE_GRID=yes
|
||||||
|
DEFAULT_wxUSE_DATAVIEWCTRL=no
|
||||||
DEFAULT_wxUSE_IMAGLIST=yes
|
DEFAULT_wxUSE_IMAGLIST=yes
|
||||||
DEFAULT_wxUSE_LISTBOOK=yes
|
DEFAULT_wxUSE_LISTBOOK=yes
|
||||||
DEFAULT_wxUSE_LISTBOX=yes
|
DEFAULT_wxUSE_LISTBOX=yes
|
||||||
@@ -7448,6 +7452,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
|
|||||||
DEFAULT_wxUSE_DATEPICKCTRL=no
|
DEFAULT_wxUSE_DATEPICKCTRL=no
|
||||||
DEFAULT_wxUSE_GAUGE=no
|
DEFAULT_wxUSE_GAUGE=no
|
||||||
DEFAULT_wxUSE_GRID=no
|
DEFAULT_wxUSE_GRID=no
|
||||||
|
DEFAULT_wxUSE_DATAVIEWCTRL=no
|
||||||
DEFAULT_wxUSE_IMAGLIST=no
|
DEFAULT_wxUSE_IMAGLIST=no
|
||||||
DEFAULT_wxUSE_LISTBOOK=no
|
DEFAULT_wxUSE_LISTBOOK=no
|
||||||
DEFAULT_wxUSE_LISTBOX=no
|
DEFAULT_wxUSE_LISTBOX=no
|
||||||
@@ -8052,6 +8057,47 @@ echo "${ECHO_T}no" >&6
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
enablestring=
|
||||||
|
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5
|
||||||
|
echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6
|
||||||
|
no_cache=0
|
||||||
|
# Check whether --enable-dataviewctrl or --disable-dataviewctrl was given.
|
||||||
|
if test "${enable_dataviewctrl+set}" = set; then
|
||||||
|
enableval="$enable_dataviewctrl"
|
||||||
|
|
||||||
|
if test "$enableval" = yes; then
|
||||||
|
ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
|
||||||
|
else
|
||||||
|
ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
LINE=`grep "wxUSE_DATAVIEWCTRL" ${wx_arg_cache_file}`
|
||||||
|
if test "x$LINE" != x ; then
|
||||||
|
eval "DEFAULT_$LINE"
|
||||||
|
else
|
||||||
|
no_cache=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL='$DEFAULT_wxUSE_DATAVIEWCTRL
|
||||||
|
|
||||||
|
fi;
|
||||||
|
|
||||||
|
eval "$ac_cv_use_dataviewctrl"
|
||||||
|
if test "$no_cache" != 1; then
|
||||||
|
echo $ac_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$wxUSE_DATAVIEWCTRL" = yes; then
|
||||||
|
echo "$as_me:$LINENO: result: yes" >&5
|
||||||
|
echo "${ECHO_T}yes" >&6
|
||||||
|
else
|
||||||
|
echo "$as_me:$LINENO: result: no" >&5
|
||||||
|
echo "${ECHO_T}no" >&6
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
enablestring=
|
enablestring=
|
||||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-imaglist" >&5
|
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-imaglist" >&5
|
||||||
echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6
|
echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6
|
||||||
@@ -43663,6 +43709,15 @@ _ACEOF
|
|||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "$wxUSE_DATAVIEWCTRL" = "yes"; then
|
||||||
|
cat >>confdefs.h <<\_ACEOF
|
||||||
|
#define wxUSE_DATAVIEWCTRL 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
USES_CONTROLS=1
|
||||||
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dataview"
|
||||||
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_IMAGLIST" = "yes"; then
|
if test "$wxUSE_IMAGLIST" = "yes"; then
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define wxUSE_IMAGLIST 1
|
#define wxUSE_IMAGLIST 1
|
||||||
|
11
configure.in
11
configure.in
@@ -505,6 +505,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
|||||||
DEFAULT_wxUSE_DISPLAY=no
|
DEFAULT_wxUSE_DISPLAY=no
|
||||||
DEFAULT_wxUSE_GAUGE=no
|
DEFAULT_wxUSE_GAUGE=no
|
||||||
DEFAULT_wxUSE_GRID=no
|
DEFAULT_wxUSE_GRID=no
|
||||||
|
DEFAULT_wxUSE_DATAVIEWCTRL=no
|
||||||
DEFAULT_wxUSE_IMAGLIST=no
|
DEFAULT_wxUSE_IMAGLIST=no
|
||||||
DEFAULT_wxUSE_LISTBOOK=no
|
DEFAULT_wxUSE_LISTBOOK=no
|
||||||
DEFAULT_wxUSE_LISTBOX=no
|
DEFAULT_wxUSE_LISTBOX=no
|
||||||
@@ -704,6 +705,7 @@ else
|
|||||||
DEFAULT_wxUSE_DISPLAY=yes
|
DEFAULT_wxUSE_DISPLAY=yes
|
||||||
DEFAULT_wxUSE_GAUGE=yes
|
DEFAULT_wxUSE_GAUGE=yes
|
||||||
DEFAULT_wxUSE_GRID=yes
|
DEFAULT_wxUSE_GRID=yes
|
||||||
|
DEFAULT_wxUSE_DATAVIEWCTRL=no
|
||||||
DEFAULT_wxUSE_IMAGLIST=yes
|
DEFAULT_wxUSE_IMAGLIST=yes
|
||||||
DEFAULT_wxUSE_LISTBOOK=yes
|
DEFAULT_wxUSE_LISTBOOK=yes
|
||||||
DEFAULT_wxUSE_LISTBOX=yes
|
DEFAULT_wxUSE_LISTBOX=yes
|
||||||
@@ -1010,6 +1012,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
|
|||||||
DEFAULT_wxUSE_DATEPICKCTRL=yes
|
DEFAULT_wxUSE_DATEPICKCTRL=yes
|
||||||
DEFAULT_wxUSE_GAUGE=yes
|
DEFAULT_wxUSE_GAUGE=yes
|
||||||
DEFAULT_wxUSE_GRID=yes
|
DEFAULT_wxUSE_GRID=yes
|
||||||
|
DEFAULT_wxUSE_DATAVIEWCTRL=no
|
||||||
DEFAULT_wxUSE_IMAGLIST=yes
|
DEFAULT_wxUSE_IMAGLIST=yes
|
||||||
DEFAULT_wxUSE_LISTBOOK=yes
|
DEFAULT_wxUSE_LISTBOOK=yes
|
||||||
DEFAULT_wxUSE_LISTBOX=yes
|
DEFAULT_wxUSE_LISTBOX=yes
|
||||||
@@ -1051,6 +1054,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
|
|||||||
DEFAULT_wxUSE_DATEPICKCTRL=no
|
DEFAULT_wxUSE_DATEPICKCTRL=no
|
||||||
DEFAULT_wxUSE_GAUGE=no
|
DEFAULT_wxUSE_GAUGE=no
|
||||||
DEFAULT_wxUSE_GRID=no
|
DEFAULT_wxUSE_GRID=no
|
||||||
|
DEFAULT_wxUSE_DATAVIEWCTRL=no
|
||||||
DEFAULT_wxUSE_IMAGLIST=no
|
DEFAULT_wxUSE_IMAGLIST=no
|
||||||
DEFAULT_wxUSE_LISTBOOK=no
|
DEFAULT_wxUSE_LISTBOOK=no
|
||||||
DEFAULT_wxUSE_LISTBOX=no
|
DEFAULT_wxUSE_LISTBOX=no
|
||||||
@@ -1094,6 +1098,7 @@ WX_ARG_ENABLE(datepick, [ --enable-datepick use wxDatePickerCtrl class
|
|||||||
WX_ARG_ENABLE(display, [ --enable-display use wxDisplay class], wxUSE_DISPLAY)
|
WX_ARG_ENABLE(display, [ --enable-display use wxDisplay class], wxUSE_DISPLAY)
|
||||||
WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE)
|
WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE)
|
||||||
WX_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID)
|
WX_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID)
|
||||||
|
WX_ARG_ENABLE(dataviewctrl,[ --enable-dataviewctrl, use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL)
|
||||||
WX_ARG_ENABLE(imaglist, [ --enable-imaglist use wxImageList class], wxUSE_IMAGLIST)
|
WX_ARG_ENABLE(imaglist, [ --enable-imaglist use wxImageList class], wxUSE_IMAGLIST)
|
||||||
WX_ARG_ENABLE(listbook, [ --enable-listbook use wxListbook class], wxUSE_LISTBOOK)
|
WX_ARG_ENABLE(listbook, [ --enable-listbook use wxListbook class], wxUSE_LISTBOOK)
|
||||||
WX_ARG_ENABLE(listbox, [ --enable-listbox use wxListBox class], wxUSE_LISTBOX)
|
WX_ARG_ENABLE(listbox, [ --enable-listbox use wxListBox class], wxUSE_LISTBOX)
|
||||||
@@ -6293,6 +6298,12 @@ if test "$wxUSE_GRID" = "yes"; then
|
|||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "$wxUSE_DATAVIEWCTRL" = "yes"; then
|
||||||
|
AC_DEFINE(wxUSE_DATAVIEWCTRL)
|
||||||
|
USES_CONTROLS=1
|
||||||
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dataview"
|
||||||
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_IMAGLIST" = "yes"; then
|
if test "$wxUSE_IMAGLIST" = "yes"; then
|
||||||
AC_DEFINE(wxUSE_IMAGLIST)
|
AC_DEFINE(wxUSE_IMAGLIST)
|
||||||
fi
|
fi
|
||||||
|
@@ -335,6 +335,8 @@
|
|||||||
|
|
||||||
#define wxUSE_GRID 0
|
#define wxUSE_GRID 0
|
||||||
|
|
||||||
|
#define wxUSE_DATAVIEWCTRL 0
|
||||||
|
|
||||||
#define wxUSE_MINIFRAME 0
|
#define wxUSE_MINIFRAME 0
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user