Continuation of 'widgets' sample improvements.

[wxWidgets.git] / configure

diff --git a/configure b/configure
index d9ff6dc69b64a4d9e1dad7494f1447675f4abdfb..2eecbba7b6be47ccf8724599fa80f11158acff7b 100755 (executable)
--- a/configure
+++ b/configure
@@ -979,7 +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-comboctrl      use wxComboCtrl class
   --enable-datepick       use wxDatePickerCtrl class
   --enable-display        use wxDisplay class
   --enable-gauge          use wxGauge class
@@ -990,7 +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-odcombobox     use wxOwnerDrawnComboBox class
   --enable-radiobox       use wxRadioBox class
   --enable-radiobtn       use wxRadioButton class
   --enable-sash           use wxSashWindow class
@@ -2198,7 +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_COMBOCTRL=no
   DEFAULT_wxUSE_DATEPICKCTRL=no
   DEFAULT_wxUSE_DISPLAY=no
   DEFAULT_wxUSE_GAUGE=no
@@ -2209,7 +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_ODCOMBOBOX=no
   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
@@ -2404,7 +2404,7 @@ else
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_CHOICEBOOK=yes
   DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_COMBOCONTROL=yes
+  DEFAULT_wxUSE_COMBOCTRL=yes
   DEFAULT_wxUSE_DATEPICKCTRL=yes
   DEFAULT_wxUSE_DISPLAY=yes
   DEFAULT_wxUSE_GAUGE=yes
@@ -2415,7 +2415,7 @@ else
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_OWNERDRAWNCOMBOBOX=yes
+  DEFAULT_wxUSE_ODCOMBOBOX=yes
   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
@@ -8044,38 +8044,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-combocontrol" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-combocontrol... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-comboctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $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"
+          # Check whether --enable-comboctrl or --disable-comboctrl was given.
+if test "${enable_comboctrl+set}" = set; then
+  enableval="$enable_comboctrl"
 
                           if test "$enableval" = yes; then
-                            ac_cv_use_combocontrol='wxUSE_COMBOCONTROL=yes'
+                            ac_cv_use_comboctrl='wxUSE_COMBOCTRL=yes'
                           else
-                            ac_cv_use_combocontrol='wxUSE_COMBOCONTROL=no'
+                            ac_cv_use_comboctrl='wxUSE_COMBOCTRL=no'
                           fi
 
 else
 
-                          LINE=`grep "wxUSE_COMBOCONTROL" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_COMBOCTRL" ${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
+                          ac_cv_use_comboctrl='wxUSE_COMBOCTRL='$DEFAULT_wxUSE_COMBOCTRL
 
 fi;
 
-          eval "$ac_cv_use_combocontrol"
+          eval "$ac_cv_use_comboctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_combocontrol >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_COMBOCONTROL" = yes; then
+          if test "$wxUSE_COMBOCTRL" = yes; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
@@ -8495,38 +8495,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-odcombo" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-odcombo... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-odcombobox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $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"
+          # Check whether --enable-odcombobox or --disable-odcombobox was given.
+if test "${enable_odcombobox+set}" = set; then
+  enableval="$enable_odcombobox"
 
                           if test "$enableval" = yes; then
-                            ac_cv_use_odcombo='wxUSE_OWNERDRAWNCOMBOBOX=yes'
+                            ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes'
                           else
-                            ac_cv_use_odcombo='wxUSE_OWNERDRAWNCOMBOBOX=no'
+                            ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no'
                           fi
 
 else
 
-                          LINE=`grep "wxUSE_OWNERDRAWNCOMBOBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_ODCOMBOBOX" ${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
+                          ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX='$DEFAULT_wxUSE_ODCOMBOBOX
 
 fi;
 
-          eval "$ac_cv_use_odcombo"
+          eval "$ac_cv_use_odcombobox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_odcombo >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_OWNERDRAWNCOMBOBOX" = yes; then
+          if test "$wxUSE_ODCOMBOBOX" = yes; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
@@ -43716,9 +43716,9 @@ _ACEOF
   USES_CONTROLS=1
 fi
 
-if test "$wxUSE_COMBOCONTROL" = "yes"; then
+if test "$wxUSE_COMBOCTRL" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
-#define wxUSE_COMBOCONTROL 1
+#define wxUSE_COMBOCTRL 1
 _ACEOF
 
   USES_CONTROLS=1
@@ -43846,9 +43846,9 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
-if test "$wxUSE_OWNERDRAWNCOMBOBOX" = "yes"; then
+if test "$wxUSE_ODCOMBOBOX" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
-#define wxUSE_OWNERDRAWNCOMBOBOX 1
+#define wxUSE_ODCOMBOBOX 1
 _ACEOF
 
   USES_CONTROLS=1