added wxUSE_PALETTE and fixed compilation with it set to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -774,6 +774,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_UNICODE=no
|
||||
DEFAULT_wxUSE_WCSRTOMBS=no
|
||||
|
||||
DEFAULT_wxUSE_PALETTE=no
|
||||
DEFAULT_wxUSE_IMAGE=no
|
||||
DEFAULT_wxUSE_GIF=no
|
||||
DEFAULT_wxUSE_PCX=no
|
||||
@@ -933,6 +934,7 @@ else
|
||||
DEFAULT_wxUSE_UNICODE=no
|
||||
DEFAULT_wxUSE_WCSRTOMBS=no
|
||||
|
||||
DEFAULT_wxUSE_PALETTE=yes
|
||||
DEFAULT_wxUSE_IMAGE=yes
|
||||
DEFAULT_wxUSE_GIF=yes
|
||||
DEFAULT_wxUSE_PCX=yes
|
||||
@@ -1290,6 +1292,7 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl support for image formats that do not rely on external library
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
WX_ARG_ENABLE(palette, [ --enable-palette use wxPalette class], wxUSE_PALETTE)
|
||||
WX_ARG_ENABLE(image, [ --enable-image use wxImage class], wxUSE_IMAGE)
|
||||
WX_ARG_ENABLE(gif, [ --enable-gif use gif images (GIF file format)], wxUSE_GIF)
|
||||
WX_ARG_ENABLE(pcx, [ --enable-pcx use pcx images (PCX file format)], wxUSE_PCX)
|
||||
@@ -4258,6 +4261,10 @@ if test "$wxUSE_VALIDATORS" = "yes"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_PALETTE" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_PALETTE)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_IMAGE" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_IMAGE)
|
||||
fi
|
||||
|
Reference in New Issue
Block a user