From 642bcba929afcfcc586f7e1f1df75205f8992d0b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 8 May 2006 23:57:40 +0000 Subject: [PATCH] wxUSE_COMBOCONTROL and wxUSE_OWNERDRAWNCOMBOBOX added git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 17 +++++++++ 2 files changed, 122 insertions(+) diff --git a/configure b/configure index 363ad51beb..d9ff6dc69b 100755 --- a/configure +++ b/configure @@ -979,6 +979,7 @@ Optional Features: --enable-choice use wxChoice class --enable-choicebook use wxChoicebook class --enable-combobox use wxComboBox class + --enable-combocontrol use wxComboControl class --enable-datepick use wxDatePickerCtrl class --enable-display use wxDisplay class --enable-gauge use wxGauge class @@ -989,6 +990,7 @@ Optional Features: --enable-listbox use wxListBox class --enable-listctrl use wxListCtrl class --enable-notebook use wxNotebook class + --enable-odcombo use wxOwnerDrawnComboBox class --enable-radiobox use wxRadioBox class --enable-radiobtn use wxRadioButton class --enable-sash use wxSashWindow class @@ -2196,6 +2198,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_CHOICEBOOK=no DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_COMBOCONTROL=no DEFAULT_wxUSE_DATEPICKCTRL=no DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_GAUGE=no @@ -2206,6 +2209,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no + DEFAULT_wxUSE_OWNERDRAWNCOMBOBOX=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_SASH=no @@ -2400,6 +2404,7 @@ else DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_CHOICEBOOK=yes DEFAULT_wxUSE_COMBOBOX=yes + DEFAULT_wxUSE_COMBOCONTROL=yes DEFAULT_wxUSE_DATEPICKCTRL=yes DEFAULT_wxUSE_DISPLAY=yes DEFAULT_wxUSE_GAUGE=yes @@ -2410,6 +2415,7 @@ else DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes + DEFAULT_wxUSE_OWNERDRAWNCOMBOBOX=yes DEFAULT_wxUSE_RADIOBOX=yes DEFAULT_wxUSE_RADIOBTN=yes DEFAULT_wxUSE_SASH=yes @@ -8037,6 +8043,47 @@ echo "${ECHO_T}no" >&6 fi + enablestring= + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-combocontrol" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-combocontrol... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-combocontrol or --disable-combocontrol was given. +if test "${enable_combocontrol+set}" = set; then + enableval="$enable_combocontrol" + + if test "$enableval" = yes; then + ac_cv_use_combocontrol='wxUSE_COMBOCONTROL=yes' + else + ac_cv_use_combocontrol='wxUSE_COMBOCONTROL=no' + fi + +else + + LINE=`grep "wxUSE_COMBOCONTROL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_combocontrol='wxUSE_COMBOCONTROL='$DEFAULT_wxUSE_COMBOCONTROL + +fi; + + eval "$ac_cv_use_combocontrol" + if test "$no_cache" != 1; then + echo $ac_cv_use_combocontrol >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_COMBOCONTROL" = 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}-datepick" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6 @@ -8447,6 +8494,47 @@ echo "${ECHO_T}no" >&6 fi + enablestring= + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-odcombo" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-odcombo... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-odcombo or --disable-odcombo was given. +if test "${enable_odcombo+set}" = set; then + enableval="$enable_odcombo" + + if test "$enableval" = yes; then + ac_cv_use_odcombo='wxUSE_OWNERDRAWNCOMBOBOX=yes' + else + ac_cv_use_odcombo='wxUSE_OWNERDRAWNCOMBOBOX=no' + fi + +else + + LINE=`grep "wxUSE_OWNERDRAWNCOMBOBOX" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_odcombo='wxUSE_OWNERDRAWNCOMBOBOX='$DEFAULT_wxUSE_OWNERDRAWNCOMBOBOX + +fi; + + eval "$ac_cv_use_odcombo" + if test "$no_cache" != 1; then + echo $ac_cv_use_odcombo >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_OWNERDRAWNCOMBOBOX" = 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}-radiobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6 @@ -43628,6 +43716,14 @@ _ACEOF USES_CONTROLS=1 fi +if test "$wxUSE_COMBOCONTROL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_COMBOCONTROL 1 +_ACEOF + + USES_CONTROLS=1 +fi + if test "$wxUSE_CHOICE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_CHOICE 1 @@ -43750,6 +43846,15 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" fi +if test "$wxUSE_OWNERDRAWNCOMBOBOX" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OWNERDRAWNCOMBOBOX 1 +_ACEOF + + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo" +fi + if test "$wxUSE_RADIOBOX" = "yes"; then cat >>confdefs.h <<\_ACEOF diff --git a/configure.in b/configure.in index e8e2b4a4a6..adf487d768 100644 --- a/configure.in +++ b/configure.in @@ -509,6 +509,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_CHOICEBOOK=no DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_COMBOCONTROL=no DEFAULT_wxUSE_DATEPICKCTRL=no DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_GAUGE=no @@ -519,6 +520,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no + DEFAULT_wxUSE_OWNERDRAWNCOMBOBOX=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_SASH=no @@ -713,6 +715,7 @@ else DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_CHOICEBOOK=yes DEFAULT_wxUSE_COMBOBOX=yes + DEFAULT_wxUSE_COMBOCONTROL=yes DEFAULT_wxUSE_DATEPICKCTRL=yes DEFAULT_wxUSE_DISPLAY=yes DEFAULT_wxUSE_GAUGE=yes @@ -723,6 +726,7 @@ else DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes + DEFAULT_wxUSE_OWNERDRAWNCOMBOBOX=yes DEFAULT_wxUSE_RADIOBOX=yes DEFAULT_wxUSE_RADIOBTN=yes DEFAULT_wxUSE_SASH=yes @@ -1112,6 +1116,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(combocontrol,[ --enable-combocontrol use wxComboControl class], wxUSE_COMBOCONTROL) 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) @@ -1122,6 +1127,7 @@ WX_ARG_ENABLE(listbook, [ --enable-listbook use wxListbook class], wxU WX_ARG_ENABLE(listbox, [ --enable-listbox use wxListBox class], wxUSE_LISTBOX) WX_ARG_ENABLE(listctrl, [ --enable-listctrl use wxListCtrl class], wxUSE_LISTCTRL) WX_ARG_ENABLE(notebook, [ --enable-notebook use wxNotebook class], wxUSE_NOTEBOOK) +WX_ARG_ENABLE(odcombo, [ --enable-odcombo use wxOwnerDrawnComboBox class], wxUSE_OWNERDRAWNCOMBOBOX) WX_ARG_ENABLE(radiobox, [ --enable-radiobox use wxRadioBox class], wxUSE_RADIOBOX) WX_ARG_ENABLE(radiobtn, [ --enable-radiobtn use wxRadioButton class], wxUSE_RADIOBTN) WX_ARG_ENABLE(sash, [ --enable-sash use wxSashWindow class], wxUSE_SASH) @@ -6275,6 +6281,11 @@ if test "$wxUSE_COMBOBOX" = "yes"; then USES_CONTROLS=1 fi +if test "$wxUSE_COMBOCONTROL" = "yes"; then + AC_DEFINE(wxUSE_COMBOCONTROL) + USES_CONTROLS=1 +fi + if test "$wxUSE_CHOICE" = "yes"; then AC_DEFINE(wxUSE_CHOICE) USES_CONTROLS=1 @@ -6354,6 +6365,12 @@ if test "$wxUSE_NOTEBOOK" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" fi +if test "$wxUSE_OWNERDRAWNCOMBOBOX" = "yes"; then + AC_DEFINE(wxUSE_OWNERDRAWNCOMBOBOX) + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo" +fi + dnl if test "$wxUSE_PROPSHEET" = "yes"; then dnl AC_DEFINE(wxUSE_PROPSHEET) dnl USES_CONTROLS=1 -- 2.47.2