--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
--enable-grid use wxGrid class
--enable-dataviewctrl, use wxDataViewCtrl class
+ --enable-hyperlink use wxHyperlinkCtrl class
--enable-imaglist use wxImageList class
--enable-listbook use wxListbook class
--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
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
DEFAULT_wxUSE_GRID=no
+ DEFAULT_wxUSE_HYPERLINKCTRL=no
DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_IMAGLIST=no
DEFAULT_wxUSE_LISTBOOK=no
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
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
DEFAULT_wxUSE_GRID=yes
+ DEFAULT_wxUSE_HYPERLINKCTRL=yes
DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOOK=yes
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
DEFAULT_wxUSE_DATEPICKCTRL=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
+ DEFAULT_wxUSE_HYPERLINKCTRL=yes
DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOOK=yes
DEFAULT_wxUSE_DATEPICKCTRL=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
+ DEFAULT_wxUSE_HYPERLINKCTRL=no
DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_IMAGLIST=no
DEFAULT_wxUSE_LISTBOOK=no
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
fi
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hyperlink" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-hyperlink or --disable-hyperlink was given.
+if test "${enable_hyperlink+set}" = set; then
+ enableval="$enable_hyperlink"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes'
+ else
+ ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_HYPERLINKCTRL" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL='$DEFAULT_wxUSE_HYPERLINKCTRL
+
+fi;
+
+ eval "$ac_cv_use_hyperlink"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_HYPERLINKCTRL" = 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}-imaglist" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&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
esac
if test "$WXGTK20" = 1; then
- save_CXXFLAGS="$CFLAGS"
+ save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
LIBS="$LIBS $wx_cv_libs_gtk"
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Xlib.h"; then
+ if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
fi
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lX11 $LIBS"
+ LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
int
main ()
{
-XrmInitialize ()
+XtMalloc (0)
;
return 0;
}
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libX11.$ac_extension; then
+ if test -r $ac_dir/libXt.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
else
-################################################################
ac_cv_func_which_gethostbyname_r=unknown
fi
-################################################################
fi
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
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
fi
+if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_HYPERLINKCTRL 1
+_ACEOF
+
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_DATAVIEWCTRL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_DATAVIEWCTRL 1
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
echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;}
wxUSE_TOGGLEBTN=no
fi
- if test "$wxUSE_UNIVERSAL" = "yes"; then
- { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under wxUniversal... disabled" >&5
-echo "$as_me: WARNING: Toggle button not yet supported under wxUniversal... disabled" >&2;}
- wxUSE_TOGGLEBTN=no
- fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
cat >>confdefs.h <<\_ACEOF
projects / wxWidgets.git / blobdiff