added --enable-uxtheme option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
38a14fe926
commit
5d18e02915
213
configure
vendored
213
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 47596 2007-07-20 17:59:45Z DE .
|
||||
# From configure.in Id: configure.in 47597 2007-07-20 18:27:35Z PC .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@ -1836,7 +1836,6 @@ Optional Features:
|
||||
--enable-metafiles use wxMetaFile (Win32 only)
|
||||
--enable-dragimage use wxDragImage
|
||||
--enable-accessibility enable accessibility support
|
||||
--enable-dccache cache temporary wxDC objects (Win32 only)
|
||||
--enable-palette use wxPalette class
|
||||
--enable-image use wxImage class
|
||||
--enable-gif use gif images (GIF file format)
|
||||
@ -1846,6 +1845,8 @@ Optional Features:
|
||||
--enable-pnm use pnm images (PNM file format)
|
||||
--enable-xpm use xpm images (XPM file format)
|
||||
--enable-icocur use Windows ICO and CUR formats
|
||||
--enable-dccache cache temporary wxDC objects (Win32 only)
|
||||
--enable-uxtheme enable support for Windows XP themed look (Win32 only)
|
||||
--disable-largefile omit support for large files
|
||||
--disable-gtktest do not try to compile and run a test GTK+ program
|
||||
--disable-gtktest Do not try to compile and run a test GTK program
|
||||
@ -15137,64 +15138,6 @@ fi
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
if test "$wxUSE_MSW" = "1"; then
|
||||
|
||||
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}-dccache" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; }
|
||||
no_cache=0
|
||||
# Check whether --enable-dccache was given.
|
||||
if test "${enable_dccache+set}" = set; then
|
||||
enableval=$enable_dccache;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_dccache='wxUSE_DC_CACHEING=yes'
|
||||
else
|
||||
wx_cv_use_dccache='wxUSE_DC_CACHEING=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
else
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_dccache"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $wx_cv_use_dccache >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_DC_CACHEING = yes; then
|
||||
result=no
|
||||
else
|
||||
result=yes
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_DC_CACHEING
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
enablestring=
|
||||
@ -15692,6 +15635,118 @@ 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}-dccache" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; }
|
||||
no_cache=0
|
||||
# Check whether --enable-dccache was given.
|
||||
if test "${enable_dccache+set}" = set; then
|
||||
enableval=$enable_dccache;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_dccache='wxUSE_DC_CACHEING=yes'
|
||||
else
|
||||
wx_cv_use_dccache='wxUSE_DC_CACHEING=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
else
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_dccache"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $wx_cv_use_dccache >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_DC_CACHEING = yes; then
|
||||
result=no
|
||||
else
|
||||
result=yes
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_DC_CACHEING
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||
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}-uxtheme" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-uxtheme... $ECHO_C" >&6; }
|
||||
no_cache=0
|
||||
# Check whether --enable-uxtheme was given.
|
||||
if test "${enable_uxtheme+set}" = set; then
|
||||
enableval=$enable_uxtheme;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_uxtheme='wxUSE_UXTHEME=yes'
|
||||
else
|
||||
wx_cv_use_uxtheme='wxUSE_UXTHEME=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
else
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_uxtheme"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $wx_cv_use_uxtheme >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_UXTHEME = yes; then
|
||||
result=no
|
||||
else
|
||||
result=yes
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_UXTHEME
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
@ -25776,11 +25831,13 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h> /* for off_t */
|
||||
#include <stdio.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
|
||||
int (*fp) (FILE *, off_t, int) = fseeko;
|
||||
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
@ -25820,11 +25877,13 @@ cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#define _LARGEFILE_SOURCE 1
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h> /* for off_t */
|
||||
#include <stdio.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
|
||||
int (*fp) (FILE *, off_t, int) = fseeko;
|
||||
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
@ -48453,13 +48512,6 @@ _ACEOF
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DC_CACHEING" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_DC_CACHEING 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DRAGIMAGE" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_DRAGIMAGE 1
|
||||
@ -48863,6 +48915,25 @@ _ACEOF
|
||||
fi
|
||||
|
||||
|
||||
if test "$wxUSE_MSW" = 1 ; then
|
||||
|
||||
if test "$wxUSE_DC_CACHEING" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_DC_CACHEING 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_UXTHEME" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_UXTHEME 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
|
||||
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
|
||||
32
configure.in
32
configure.in
@ -876,10 +876,6 @@ WX_ARG_FEATURE(metafile, [ --enable-metafiles use wxMetaFile (Win32 onl
|
||||
WX_ARG_FEATURE(dragimage, [ --enable-dragimage use wxDragImage], wxUSE_DRAGIMAGE)
|
||||
WX_ARG_FEATURE(accessibility,[ --enable-accessibility enable accessibility support], wxUSE_ACCESSIBILITY)
|
||||
|
||||
if test "$wxUSE_MSW" = "1"; then
|
||||
WX_ARG_FEATURE(dccache, [ --enable-dccache cache temporary wxDC objects (Win32 only)], wxUSE_DC_CACHEING)
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl support for image formats that do not rely on external library
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@ -894,6 +890,13 @@ WX_ARG_FEATURE(pnm, [ --enable-pnm use pnm images (PNM file
|
||||
WX_ARG_FEATURE(xpm, [ --enable-xpm use xpm images (XPM file format)], wxUSE_XPM)
|
||||
WX_ARG_FEATURE(ico_cur, [ --enable-icocur use Windows ICO and CUR formats], wxUSE_ICO_CUR)
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl wxMSW-only options
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
WX_ARG_FEATURE(dccache, [ --enable-dccache cache temporary wxDC objects (Win32 only)], wxUSE_DC_CACHEING)
|
||||
WX_ARG_FEATURE(uxtheme, [ --enable-uxtheme enable support for Windows XP themed look (Win32 only)], wxUSE_UXTHEME)
|
||||
|
||||
fi
|
||||
dnl for GUI only
|
||||
|
||||
@ -6794,10 +6797,6 @@ if test "$wxUSE_ACCESSIBILITY" = "yes"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DC_CACHEING" = "yes"; then
|
||||
AC_DEFINE(wxUSE_DC_CACHEING)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DRAGIMAGE" = "yes"; then
|
||||
AC_DEFINE(wxUSE_DRAGIMAGE)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
|
||||
@ -7036,6 +7035,23 @@ if test "$wxUSE_WIZARDDLG" = "yes"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl wxMSW-only options
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
if test "$wxUSE_MSW" = 1 ; then
|
||||
|
||||
if test "$wxUSE_DC_CACHEING" = "yes"; then
|
||||
AC_DEFINE(wxUSE_DC_CACHEING)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_UXTHEME" = "yes"; then
|
||||
AC_DEFINE(wxUSE_UXTHEME)
|
||||
fi
|
||||
|
||||
fi
|
||||
dnl wxUSE_MSW = 1
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl wxGraphicsContext
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
@ -723,7 +723,7 @@
|
||||
/*
|
||||
* Set to 1 to compile MS Windows XP theme engine support
|
||||
*/
|
||||
#define wxUSE_UXTHEME 1
|
||||
#define wxUSE_UXTHEME 0
|
||||
|
||||
/*
|
||||
* Set to 1 to auto-adapt to MS Windows XP themes where possible
|
||||
|
||||
Loading…
Reference in New Issue
Block a user