cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxChoicebook generic implementation.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2004-09-16 15:13:52 +00:00
parent f5e0b4bc7c
commit 92bbdbcdb8
4 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
configure vendored
View File

@ -967,6 +967,7 @@ Optional Features:
--enable-checkbox use wxCheckBox class
--enable-checklst use wxCheckListBox (listbox with checkboxes) class
--enable-choice use wxChoice class
--enable-choicebook use wxChoicebook class
--enable-combobox use wxComboBox class
--enable-display use wxDisplay class
--enable-gauge use wxGauge class
@ -2145,6 +2146,7 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_CHECKBOX=no
DEFAULT_wxUSE_CHECKLST=no
DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_CHOICEBOOK=no
DEFAULT_wxUSE_COMBOBOX=no
DEFAULT_wxUSE_DISPLAY=no
DEFAULT_wxUSE_GAUGE=no
@ -2329,6 +2331,7 @@ else
DEFAULT_wxUSE_CHECKBOX=yes
DEFAULT_wxUSE_CHECKLST=yes
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_CHOICEBOOK=yes
DEFAULT_wxUSE_COMBOBOX=yes
DEFAULT_wxUSE_DISPLAY=yes
DEFAULT_wxUSE_GAUGE=yes
@ -6889,6 +6892,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
DEFAULT_wxUSE_CHECKBOX=yes
DEFAULT_wxUSE_CHECKLISTBOX=yes
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_CHOICEBOOK=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
DEFAULT_wxUSE_IMAGLIST=yes
@ -6927,6 +6931,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_CHECKBOX=no
DEFAULT_wxUSE_CHECKLISTBOX=no
DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_CHOICEBOOK=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
DEFAULT_wxUSE_IMAGLIST=no
@ -7294,6 +7299,47 @@ echo "${ECHO_T}no" >&6
fi
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicebook" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6
no_cache=0
# Check whether --enable-choicebook or --disable-choicebook was given.
if test "${enable_choicebook+set}" = set; then
enableval="$enable_choicebook"
if test "$enableval" = yes; then
ac_cv_use_choicebook='wxUSE_CHOICEBOOK=yes'
else
ac_cv_use_choicebook='wxUSE_CHOICEBOOK=no'
fi
else
LINE=`grep "wxUSE_CHOICEBOOK" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_choicebook='wxUSE_CHOICEBOOK='$DEFAULT_wxUSE_CHOICEBOOK
fi;
eval "$ac_cv_use_choicebook"
if test "$no_cache" != 1; then
echo $ac_cv_use_choicebook >> ${wx_arg_cache_file}.tmp
fi
if test "$wxUSE_CHOICEBOOK" = 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}-combobox" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6
@ -36273,6 +36319,14 @@ _ACEOF
USES_CONTROLS=1
fi
if test "$wxUSE_CHOICEBOOK" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_CHOICEBOOK 1
_ACEOF
USES_CONTROLS=1
fi
if test "$wxUSE_CHECKBOX" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_CHECKBOX 1

10
configure.in
View File

@ -493,6 +493,7 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_CHECKBOX=no
DEFAULT_wxUSE_CHECKLST=no
DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_CHOICEBOOK=no
DEFAULT_wxUSE_COMBOBOX=no
DEFAULT_wxUSE_DISPLAY=no
DEFAULT_wxUSE_GAUGE=no
@ -677,6 +678,7 @@ else
DEFAULT_wxUSE_CHECKBOX=yes
DEFAULT_wxUSE_CHECKLST=yes
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_CHOICEBOOK=yes
DEFAULT_wxUSE_COMBOBOX=yes
DEFAULT_wxUSE_DISPLAY=yes
DEFAULT_wxUSE_GAUGE=yes
@ -968,6 +970,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
DEFAULT_wxUSE_CHECKBOX=yes
DEFAULT_wxUSE_CHECKLISTBOX=yes
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_CHOICEBOOK=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
DEFAULT_wxUSE_IMAGLIST=yes
@ -1006,6 +1009,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_CHECKBOX=no
DEFAULT_wxUSE_CHECKLISTBOX=no
DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_CHOICEBOOK=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
DEFAULT_wxUSE_IMAGLIST=no
@ -1052,6 +1056,7 @@ WX_ARG_ENABLE(caret, [ --enable-caret use wxCaret class], wxUSE_
WX_ARG_ENABLE(checkbox, [ --enable-checkbox use wxCheckBox class], wxUSE_CHECKBOX)
WX_ARG_ENABLE(checklst, [ --enable-checklst use wxCheckListBox (listbox with checkboxes) class], wxUSE_CHECKLST)
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(display, [ --enable-display use wxDisplay class], wxUSE_DISPLAY)
WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE)
@ -5355,6 +5360,11 @@ if test "$wxUSE_CHOICE" = "yes"; then
USES_CONTROLS=1
fi
if test "$wxUSE_CHOICEBOOK" = "yes"; then
AC_DEFINE(wxUSE_CHOICEBOOK)
USES_CONTROLS=1
fi
if test "$wxUSE_CHECKBOX" = "yes"; then
AC_DEFINE(wxUSE_CHECKBOX)
USES_CONTROLS=1

1
setup.h.in
View File

@ -477,6 +477,7 @@
*/
#define wxUSE_NOTEBOOK 0
#define wxUSE_LISTBOOK 0
#define wxUSE_CHOICEBOOK 0
/*
* Use this control
*/

1
setup.h_vms
View File

@ -490,6 +490,7 @@
*/
#define wxUSE_NOTEBOOK 1
#define wxUSE_LISTBOOK 1
#define wxUSE_CHOICEBOOK 1
/*
* Use this control
*/