added wxUSE_HEADERCTRL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-11 00:57:08 +00:00
parent 65ead2309a
commit e721a2a2a4
18 changed files with 128 additions and 9 deletions

56
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 57865 2009-01-06 22:28:16Z VS .
# From configure.in Id: configure.in 58007 2009-01-11 00:46:55Z VZ .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
@@ -1805,6 +1805,7 @@ Optional Features:
--enable-fontpicker use wxFontPickerCtrl class
--enable-gauge use wxGauge class
--enable-grid use wxGrid class
--enable-headerctrl use wxHeaderCtrl class
--enable-hyperlink use wxHyperlinkCtrl class
--enable-imaglist use wxImageList class
--enable-listbook use wxListbook class
@@ -9440,6 +9441,7 @@ if test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_FONTPICKERCTRL=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
DEFAULT_wxUSE_HEADERCTRL=no
DEFAULT_wxUSE_HYPERLINKCTRL=no
DEFAULT_wxUSE_IMAGLIST=no
DEFAULT_wxUSE_LISTBOOK=no
@@ -10616,6 +10618,50 @@ fi
echo "${ECHO_T}$result" >&6; }
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
if test x"$enablestring" = xdisable; then
defaultval=yes
else
defaultval=no
fi
fi
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-headerctrl" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-headerctrl... $ECHO_C" >&6; }
# Check whether --enable-headerctrl was given.
if test "${enable_headerctrl+set}" = set; then
enableval=$enable_headerctrl;
if test "$enableval" = yes; then
wx_cv_use_headerctrl='wxUSE_HEADERCTRL=yes'
else
wx_cv_use_headerctrl='wxUSE_HEADERCTRL=no'
fi
else
wx_cv_use_headerctrl='wxUSE_HEADERCTRL=${'DEFAULT_wxUSE_HEADERCTRL":-$defaultval}"
fi
eval "$wx_cv_use_headerctrl"
if test x"$enablestring" = xdisable; then
if test $wxUSE_HEADERCTRL = yes; then
result=no
else
result=yes
fi
else
result=$wxUSE_HEADERCTRL
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
@@ -45814,6 +45860,14 @@ _ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
fi
if test "$wxUSE_HEADERCTRL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_HEADERCTRL 1
_ACEOF
USES_CONTROLS=1
fi
if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_HYPERLINKCTRL 1