IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add GOFFICE_WITH_CAIRO to enable build without GogRendererPixbuf.

Browse Source 
Check whether we find gog-renderer-cairo.h with the help of
GOFFICE_CFLAGS.  If it is found, use GogRendererCairo instead of
GogRendererPixbuf.  Newer goffice releases do not ship the latter any
more.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15704 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Andreas Köhler 2007-03-09 22:44:33 +00:00
parent 1c379e731d
commit 5354305dc6
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -1138,6 +1138,12 @@ then
AC_SUBST(GOFFICE_CFLAGS)
AC_SUBST(GOFFICE_LIBS)
saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${GOFFICE_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER(goffice/graph/gog-renderer-cairo.h,
[AC_DEFINE(GOFFICE_WITH_CAIRO,1,[GOffice has been built with cairo support])])
CPPFLAGS="${saved_CPPFLAGS}"
##################################################
# regex needs its own linker flag on win32 platform
##################################################

20
src/gnome-utils/gnc-html-graph-gog.c
View File

@ -35,7 +35,11 @@
#include <goffice/goffice.h>
#include <goffice/graph/gog-graph.h>
#include <goffice/graph/gog-object.h>
#include <goffice/graph/gog-renderer-pixbuf.h>
#ifdef GOFFICE_WITH_CAIRO
# include <goffice/graph/gog-renderer-cairo.h>
#else
# include <goffice/graph/gog-renderer-pixbuf.h>
#endif
#include <goffice/graph/gog-renderer-gnome-print.h>
#include <goffice/graph/gog-style.h>
#include <goffice/graph/gog-styled-object.h>
@ -158,7 +162,11 @@ static void
add_pixbuf_graph_widget( GtkHTMLEmbedded *eb, GogObject *graph )
{
GtkWidget *widget;
#ifdef GOFFICE_WITH_CAIRO
GogRendererCairo *cairo_renderer;
#else
GogRendererPixbuf *pixbuf_renderer;
#endif
GdkPixbuf *buf;
gboolean update_status;
@ -168,12 +176,22 @@ add_pixbuf_graph_widget( GtkHTMLEmbedded *eb, GogObject *graph )
// gnumeric uses. We probably _should_ do something like that, though.
gog_object_update (GOG_OBJECT (graph));
#ifdef GOFFICE_WITH_CAIRO
cairo_renderer = GOG_RENDERER_CAIRO (g_object_new (GOG_RENDERER_CAIRO_TYPE,
"model", graph,
NULL));
update_status = gog_renderer_cairo_update (cairo_renderer,
eb->width, eb->height, 1.0);
buf = gog_renderer_cairo_get_pixbuf (cairo_renderer);
#else
pixbuf_renderer = GOG_RENDERER_PIXBUF (g_object_new (GOG_RENDERER_PIXBUF_TYPE,
"model", graph,
NULL));
update_status = gog_renderer_pixbuf_update (pixbuf_renderer,
eb->width, eb->height, 1.0);
buf = gog_renderer_pixbuf_get (pixbuf_renderer);
#endif /* GOFFICE_WITH_CAIRO */
widget = gtk_image_new_from_pixbuf (buf);
gtk_widget_set_size_request (widget, eb->width, eb->height);
gtk_widget_show_all (widget);