Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxUSE_SVG

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-11 20:52:41 +00:00
parent 8e10778e0e
commit b0fc907f70
13 changed files with 147 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 47339 2007-07-11 20:03:11Z VZ .
# From configure.in Id: configure.in 47340 2007-07-11 20:11:37Z VZ .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for wxWidgets 2.9.0.
#
@@ -1050,6 +1050,7 @@ Optional Features:
--enable-richtext use wxRichTextCtrl
--enable-graphics_ctx use graphics context 2D drawing API
--enable-postscript use wxPostscriptDC device context (default for gtk+)
--enable-svg use wxSVGFileDC device context
--enable-clipboard use wxClipboard class
--enable-dnd use Drag'n'Drop classes
--enable-metafile use win32 metafiles
@@ -9148,6 +9149,61 @@ 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}-svg" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6
no_cache=0
# Check whether --enable-svg or --disable-svg was given.
if test "${enable_svg+set}" = set; then
enableval="$enable_svg"
if test "$enableval" = yes; then
ac_cv_use_svg='wxUSE_SVG=yes'
else
ac_cv_use_svg='wxUSE_SVG=no'
fi
else
LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
fi;
eval "$ac_cv_use_svg"
if test "$no_cache" != 1; then
echo $ac_cv_use_svg >> ${wx_arg_cache_file}.tmp
fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SVG = yes; then
result=no
else
result=yes
fi
else
result=$wxUSE_SVG
fi
echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6
enablestring=
@@ -46514,24 +46570,6 @@ _ACEOF
fi
if test "$wxUSE_POSTSCRIPT" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_POSTSCRIPT 1
_ACEOF
fi
cat >>confdefs.h <<\_ACEOF
#define wxUSE_AFM_FOR_POSTSCRIPT 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define wxUSE_NORMALIZED_PS_FONTS 1
_ACEOF
if test "$wxUSE_CONSTRAINTS" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_CONSTRAINTS 1
@@ -46609,6 +46647,29 @@ _ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
fi
if test "$wxUSE_POSTSCRIPT" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_POSTSCRIPT 1
_ACEOF
fi
cat >>confdefs.h <<\_ACEOF
#define wxUSE_AFM_FOR_POSTSCRIPT 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define wxUSE_NORMALIZED_PS_FONTS 1
_ACEOF
if test "$wxUSE_SVG" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_SVG 1
_ACEOF
fi
if test "$wxUSE_METAFILE" = "yes"; then

24
configure.in
View File

@@ -634,6 +634,7 @@ WX_ARG_FEATURE(webkit, [ --enable-webkit use wxWebKitCtrl (Mac)],
WX_ARG_FEATURE(richtext, [ --enable-richtext use wxRichTextCtrl], wxUSE_RICHTEXT)
WX_ARG_FEATURE(graphics_ctx,[ --enable-graphics_ctx use graphics context 2D drawing API], wxUSE_GRAPHICS_CONTEXT)
WX_ARG_FEATURE(postscript, [ --enable-postscript use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT)
WX_ARG_FEATURE(svg, [ --enable-svg use wxSVGFileDC device context], wxUSE_SVG)
dnl ---------------------------------------------------------------------------
dnl IPC &c
@@ -6169,18 +6170,6 @@ if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF)
fi
dnl ----------------------------------------------------------------
dnl Register PostScript options for makefiles and setup.h
dnl ----------------------------------------------------------------
if test "$wxUSE_POSTSCRIPT" = "yes" ; then
AC_DEFINE(wxUSE_POSTSCRIPT)
fi
AC_DEFINE(wxUSE_AFM_FOR_POSTSCRIPT)
AC_DEFINE(wxUSE_NORMALIZED_PS_FONTS)
dnl ---------------------------------------------------------------------------
dnl big GUI components: MDI, doc/view, printing, help, ...
dnl ---------------------------------------------------------------------------
@@ -6236,6 +6225,17 @@ if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
fi
if test "$wxUSE_POSTSCRIPT" = "yes" ; then
AC_DEFINE(wxUSE_POSTSCRIPT)
fi
AC_DEFINE(wxUSE_AFM_FOR_POSTSCRIPT)
AC_DEFINE(wxUSE_NORMALIZED_PS_FONTS)
if test "$wxUSE_SVG" = "yes"; then
AC_DEFINE(wxUSE_SVG)
fi
dnl ---------------------------------------------------------------------------
dnl wxMetafile availability

9
include/wx/chkconf.h
View File

@@ -1812,6 +1812,15 @@
# endif
#endif /* wxUSE_SOCKETS */
#if wxUSE_SVG && !wxUSE_STREAMS
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_SVG requires wxUSE_STREAMS"
# else
# undef wxUSE_SVG
# define wxUSE_SVG 0
# endif
#endif /* wxUSE_SVG */
#if !wxUSE_VARIANT
# if wxUSE_DATAVIEWCTRL
# ifdef wxABORT_ON_CONFIG_ERROR

4
include/wx/dcsvg.h
View File

@@ -15,6 +15,8 @@
#include "wx/string.h"
#include "wx/dc.h"
#if wxUSE_SVG
#define wxSVGVersion wxT("v0100")
#ifdef __BORLANDC__
@@ -191,4 +193,6 @@ private:
DECLARE_ABSTRACT_CLASS(wxSVGFileDC)
};
#endif // wxUSE_SVG
#endif // _WX_DCSVG_H_

6
include/wx/mac/setup0.h
View File

@@ -1099,7 +1099,7 @@
// Include mouse wheel support
// ----------------------------------------------------------------------------
// postscript support settings
// wxDC classes for various output formats
// ----------------------------------------------------------------------------
// Set to 1 for PostScript device context.
@@ -1108,6 +1108,10 @@
// Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 1
// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
// to create fiels in SVG (Scalable Vector Graphics) format.
#define wxUSE_SVG 1
// ----------------------------------------------------------------------------
// database classes
// ----------------------------------------------------------------------------

6
include/wx/motif/setup0.h
View File

@@ -1098,7 +1098,7 @@
// Include mouse wheel support
// ----------------------------------------------------------------------------
// postscript support settings
// wxDC classes for various output formats
// ----------------------------------------------------------------------------
// Set to 1 for PostScript device context.
@@ -1107,6 +1107,10 @@
// Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 1
// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
// to create fiels in SVG (Scalable Vector Graphics) format.
#define wxUSE_SVG 1
// ----------------------------------------------------------------------------
// database classes
// ----------------------------------------------------------------------------

6
include/wx/msw/setup0.h
View File

@@ -1098,7 +1098,7 @@
// Include mouse wheel support
// ----------------------------------------------------------------------------
// postscript support settings
// wxDC classes for various output formats
// ----------------------------------------------------------------------------
// Set to 1 for PostScript device context.
@@ -1107,6 +1107,10 @@
// Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 1
// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
// to create fiels in SVG (Scalable Vector Graphics) format.
#define wxUSE_SVG 1
// ----------------------------------------------------------------------------
// database classes
// ----------------------------------------------------------------------------

6
include/wx/msw/wince/setup.h
View File

@@ -1098,7 +1098,7 @@
// Include mouse wheel support
// ----------------------------------------------------------------------------
// postscript support settings
// wxDC classes for various output formats
// ----------------------------------------------------------------------------
// Set to 1 for PostScript device context.
@@ -1107,6 +1107,10 @@
// Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 1
// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
// to create fiels in SVG (Scalable Vector Graphics) format.
#define wxUSE_SVG 1
// ----------------------------------------------------------------------------
// database classes
// ----------------------------------------------------------------------------

6
include/wx/os2/setup0.h
View File

@@ -1098,7 +1098,7 @@
// Include mouse wheel support
// ----------------------------------------------------------------------------
// postscript support settings
// wxDC classes for various output formats
// ----------------------------------------------------------------------------
// Set to 1 for PostScript device context.
@@ -1107,6 +1107,10 @@
// Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 1
// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
// to create fiels in SVG (Scalable Vector Graphics) format.
#define wxUSE_SVG 1
// ----------------------------------------------------------------------------
// database classes
// ----------------------------------------------------------------------------

6
include/wx/palmos/setup0.h
View File

@@ -1098,7 +1098,7 @@
// Include mouse wheel support
// ----------------------------------------------------------------------------
// postscript support settings
// wxDC classes for various output formats
// ----------------------------------------------------------------------------
// Set to 1 for PostScript device context.
@@ -1107,6 +1107,10 @@
// Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 1
// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
// to create fiels in SVG (Scalable Vector Graphics) format.
#define wxUSE_SVG 1
// ----------------------------------------------------------------------------
// database classes
// ----------------------------------------------------------------------------

6
include/wx/setup_inc.h
View File

@@ -1094,7 +1094,7 @@
// Include mouse wheel support
// ----------------------------------------------------------------------------
// postscript support settings
// wxDC classes for various output formats
// ----------------------------------------------------------------------------
// Set to 1 for PostScript device context.
@@ -1103,6 +1103,10 @@
// Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 1
// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
// to create fiels in SVG (Scalable Vector Graphics) format.
#define wxUSE_SVG 1
// ----------------------------------------------------------------------------
// database classes
// ----------------------------------------------------------------------------

2
setup.h.in
View File

@@ -493,6 +493,8 @@
#define wxUSE_AFM_FOR_POSTSCRIPT 0
#define wxUSE_SVG 0
#define wxUSE_ODBC 0

4
src/common/dcsvg.cpp
View File

@@ -15,6 +15,8 @@
#pragma hdrstop
#endif
#if wxUSE_SVG
#ifndef WX_PRECOMP
#include "wx/image.h"
#endif
@@ -712,3 +714,5 @@ void wxSVGFileDC::SetDeviceOrigin(wxCoord x, wxCoord y)
#pragma warn .ccc
#endif
#endif // wxUSE_SVG