added wxUSE_DATEPICKCTRL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
097d3ba2ab
commit
da98e9be4e
56
configure
vendored
56
configure
vendored
@ -972,6 +972,7 @@ Optional Features:
|
||||
--enable-choice use wxChoice class
|
||||
--enable-choicebook use wxChoicebook class
|
||||
--enable-combobox use wxComboBox class
|
||||
--enable-datepick use wxDatePickerCtrl class
|
||||
--enable-display use wxDisplay class
|
||||
--enable-gauge use wxGauge class
|
||||
--enable-grid use wxGrid class
|
||||
@ -2166,6 +2167,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_CHOICE=no
|
||||
DEFAULT_wxUSE_CHOICEBOOK=no
|
||||
DEFAULT_wxUSE_COMBOBOX=no
|
||||
DEFAULT_wxUSE_DATEPICKCTRL=no
|
||||
DEFAULT_wxUSE_DISPLAY=no
|
||||
DEFAULT_wxUSE_GAUGE=no
|
||||
DEFAULT_wxUSE_GRID=no
|
||||
@ -2357,6 +2359,7 @@ else
|
||||
DEFAULT_wxUSE_CHOICE=yes
|
||||
DEFAULT_wxUSE_CHOICEBOOK=yes
|
||||
DEFAULT_wxUSE_COMBOBOX=yes
|
||||
DEFAULT_wxUSE_DATEPICKCTRL=yes
|
||||
DEFAULT_wxUSE_DISPLAY=yes
|
||||
DEFAULT_wxUSE_GAUGE=yes
|
||||
DEFAULT_wxUSE_GRID=yes
|
||||
@ -7106,13 +7109,14 @@ if test "$wxUSE_CONTROLS" = "yes"; then
|
||||
DEFAULT_wxUSE_ACCEL=yes
|
||||
DEFAULT_wxUSE_BMPBUTTON=yes
|
||||
DEFAULT_wxUSE_BUTTON=yes
|
||||
DEFAULT_wxUSE_CALCTRL=no
|
||||
DEFAULT_wxUSE_CALCTRL=yes
|
||||
DEFAULT_wxUSE_CARET=yes
|
||||
DEFAULT_wxUSE_COMBOBOX=yes
|
||||
DEFAULT_wxUSE_CHECKBOX=yes
|
||||
DEFAULT_wxUSE_CHECKLISTBOX=yes
|
||||
DEFAULT_wxUSE_CHOICE=yes
|
||||
DEFAULT_wxUSE_CHOICEBOOK=yes
|
||||
DEFAULT_wxUSE_DATEPICKCTRL=yes
|
||||
DEFAULT_wxUSE_GAUGE=yes
|
||||
DEFAULT_wxUSE_GRID=yes
|
||||
DEFAULT_wxUSE_IMAGLIST=yes
|
||||
@ -7152,6 +7156,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
|
||||
DEFAULT_wxUSE_CHECKLISTBOX=no
|
||||
DEFAULT_wxUSE_CHOICE=no
|
||||
DEFAULT_wxUSE_CHOICEBOOK=no
|
||||
DEFAULT_wxUSE_DATEPICKCTRL=no
|
||||
DEFAULT_wxUSE_GAUGE=no
|
||||
DEFAULT_wxUSE_GRID=no
|
||||
DEFAULT_wxUSE_IMAGLIST=no
|
||||
@ -7593,6 +7598,47 @@ echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
enablestring=
|
||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6
|
||||
no_cache=0
|
||||
# Check whether --enable-datepick or --disable-datepick was given.
|
||||
if test "${enable_datepick+set}" = set; then
|
||||
enableval="$enable_datepick"
|
||||
|
||||
if test "$enableval" = yes; then
|
||||
ac_cv_use_datepick='wxUSE_DATEPICKCTRL=yes'
|
||||
else
|
||||
ac_cv_use_datepick='wxUSE_DATEPICKCTRL=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "wxUSE_DATEPICKCTRL" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
else
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
ac_cv_use_datepick='wxUSE_DATEPICKCTRL='$DEFAULT_wxUSE_DATEPICKCTRL
|
||||
|
||||
fi;
|
||||
|
||||
eval "$ac_cv_use_datepick"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $ac_cv_use_datepick >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DATEPICKCTRL" = 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=
|
||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6
|
||||
@ -37518,6 +37564,14 @@ _ACEOF
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DATEPICKCTRL" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_DATEPICKCTRL 1
|
||||
_ACEOF
|
||||
|
||||
USES_CONTROLS=1
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DISPLAY" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_DISPLAY 1
|
||||
|
||||
12
configure.in
12
configure.in
@ -513,6 +513,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_CHOICE=no
|
||||
DEFAULT_wxUSE_CHOICEBOOK=no
|
||||
DEFAULT_wxUSE_COMBOBOX=no
|
||||
DEFAULT_wxUSE_DATEPICKCTRL=no
|
||||
DEFAULT_wxUSE_DISPLAY=no
|
||||
DEFAULT_wxUSE_GAUGE=no
|
||||
DEFAULT_wxUSE_GRID=no
|
||||
@ -704,6 +705,7 @@ else
|
||||
DEFAULT_wxUSE_CHOICE=yes
|
||||
DEFAULT_wxUSE_CHOICEBOOK=yes
|
||||
DEFAULT_wxUSE_COMBOBOX=yes
|
||||
DEFAULT_wxUSE_DATEPICKCTRL=yes
|
||||
DEFAULT_wxUSE_DISPLAY=yes
|
||||
DEFAULT_wxUSE_GAUGE=yes
|
||||
DEFAULT_wxUSE_GRID=yes
|
||||
@ -988,13 +990,14 @@ if test "$wxUSE_CONTROLS" = "yes"; then
|
||||
DEFAULT_wxUSE_ACCEL=yes
|
||||
DEFAULT_wxUSE_BMPBUTTON=yes
|
||||
DEFAULT_wxUSE_BUTTON=yes
|
||||
DEFAULT_wxUSE_CALCTRL=no
|
||||
DEFAULT_wxUSE_CALCTRL=yes
|
||||
DEFAULT_wxUSE_CARET=yes
|
||||
DEFAULT_wxUSE_COMBOBOX=yes
|
||||
DEFAULT_wxUSE_CHECKBOX=yes
|
||||
DEFAULT_wxUSE_CHECKLISTBOX=yes
|
||||
DEFAULT_wxUSE_CHOICE=yes
|
||||
DEFAULT_wxUSE_CHOICEBOOK=yes
|
||||
DEFAULT_wxUSE_DATEPICKCTRL=yes
|
||||
DEFAULT_wxUSE_GAUGE=yes
|
||||
DEFAULT_wxUSE_GRID=yes
|
||||
DEFAULT_wxUSE_IMAGLIST=yes
|
||||
@ -1034,6 +1037,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
|
||||
DEFAULT_wxUSE_CHECKLISTBOX=no
|
||||
DEFAULT_wxUSE_CHOICE=no
|
||||
DEFAULT_wxUSE_CHOICEBOOK=no
|
||||
DEFAULT_wxUSE_DATEPICKCTRL=no
|
||||
DEFAULT_wxUSE_GAUGE=no
|
||||
DEFAULT_wxUSE_GRID=no
|
||||
DEFAULT_wxUSE_IMAGLIST=no
|
||||
@ -1074,6 +1078,7 @@ WX_ARG_ENABLE(checklst, [ --enable-checklst use wxCheckListBox (listbo
|
||||
WX_ARG_ENABLE(choice, [ --enable-choice use wxChoice class], wxUSE_CHOICE)
|
||||
WX_ARG_ENABLE(choicebook, [ --enable-choicebook use wxChoicebook class], wxUSE_CHOICEBOOK)
|
||||
WX_ARG_ENABLE(combobox, [ --enable-combobox use wxComboBox class], wxUSE_COMBOBOX)
|
||||
WX_ARG_ENABLE(datepick, [ --enable-datepick use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL)
|
||||
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(grid, [ --enable-grid use wxGrid class], wxUSE_GRID)
|
||||
@ -5530,6 +5535,11 @@ if test "$wxUSE_CHECKLST" = "yes"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DATEPICKCTRL" = "yes"; then
|
||||
AC_DEFINE(wxUSE_DATEPICKCTRL)
|
||||
USES_CONTROLS=1
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DISPLAY" = "yes"; then
|
||||
AC_DEFINE(wxUSE_DISPLAY)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user