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

Fix bug 594048 - gnucash will not compile with most recent goffice versions

Browse Source 
Patch by Jean Brefort


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18311 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Phil Longstaff 2009-09-11 23:18:38 +00:00
parent 358bf9fe89
commit 3cb697a9eb
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/html/gnc-html-graph-gog.c
View File

@ -59,6 +59,9 @@ requires libgoffice >= 0.7.5, the contents of the #else block must stay. */
# include <goffice/utils/go-style.h> # include <goffice/utils/go-style.h>
# include <goffice/utils/go-styled-object.h> # include <goffice/utils/go-styled-object.h>
#endif #endif
#ifndef GO_COLOR_FROM_GDK
# define GO_COLOR_FROM_GDK GDK_TO_UINT
#endif
#include <goffice/graph/gog-styled-object.h> #include <goffice/graph/gog-styled-object.h>
#include <goffice/graph/gog-plot.h> #include <goffice/graph/gog-plot.h>
#include <goffice/graph/gog-series.h> #include <goffice/graph/gog-series.h>
@ -233,8 +236,13 @@ gnc_html_graph_gog_create_piechart( GncHtmlPieChartInfo* info )
} }
gog_object_add_by_name( chart, "Legend", NULL ); gog_object_add_by_name( chart, "Legend", NULL );
#ifdef GO_COLOR_BLACK
GOG_STYLED_OBJECT(graph)->style->line.width = 5;
GOG_STYLED_OBJECT(graph)->style->line.color = GO_COLOR_BLACK;
#else
GOG_STYLED_OBJECT(graph)->style->outline.width = 5; GOG_STYLED_OBJECT(graph)->style->outline.width = 5;
GOG_STYLED_OBJECT(graph)->style->outline.color = RGBA_BLACK; GOG_STYLED_OBJECT(graph)->style->outline.color = RGBA_BLACK;
#endif
series = gog_plot_new_series( plot ); series = gog_plot_new_series( plot );
labelData = go_data_vector_str_new( (gchar const * const *)info->labels, info->datasize, NULL ); labelData = go_data_vector_str_new( (gchar const * const *)info->labels, info->datasize, NULL );
@ -321,7 +329,7 @@ gnc_html_graph_gog_create_barchart( GncHtmlBarChartInfo* info )
style->fill.type = GO_STYLE_FILL_PATTERN; style->fill.type = GO_STYLE_FILL_PATTERN;
if( gdk_color_parse( info->col_colors[i], &color ) ) { if( gdk_color_parse( info->col_colors[i], &color ) ) {
style->fill.auto_back = FALSE; style->fill.auto_back = FALSE;
go_pattern_set_solid( &style->fill.pattern, GDK_TO_UINT(color) ); go_pattern_set_solid( &style->fill.pattern, GO_COLOR_FROM_GDK(color) );
} else { } else {
g_warning( "cannot parse color [%s]", info->col_colors[i] ); g_warning( "cannot parse color [%s]", info->col_colors[i] );
} }
@ -417,7 +425,7 @@ gnc_html_graph_gog_create_linechart( GncHtmlLineChartInfo* info )
style->fill.type = GO_STYLE_FILL_PATTERN; style->fill.type = GO_STYLE_FILL_PATTERN;
if( gdk_color_parse( info->col_colors[i], &color ) ) { if( gdk_color_parse( info->col_colors[i], &color ) ) {
style->fill.auto_back = FALSE; style->fill.auto_back = FALSE;
go_pattern_set_solid( &style->fill.pattern, GDK_TO_UINT(color) ); go_pattern_set_solid( &style->fill.pattern, GO_COLOR_FROM_GDK(color) );
} else { } else {
g_warning( "cannot parse color [%s]", info->col_colors[i] ); g_warning( "cannot parse color [%s]", info->col_colors[i] );
} }
@ -503,9 +511,9 @@ gnc_html_graph_gog_create_scatterplot( GncHtmlScatterPlotInfo* info )
GdkColor color; GdkColor color;
if( gdk_color_parse( info->color_str, &color ) ) { if( gdk_color_parse( info->color_str, &color ) ) {
style->marker.auto_outline_color = FALSE; style->marker.auto_outline_color = FALSE;
go_marker_set_outline_color( style->marker.mark, GDK_TO_UINT(color) ); go_marker_set_outline_color( style->marker.mark, GO_COLOR_FROM_GDK(color) );
style->line.auto_color = FALSE; style->line.auto_color = FALSE;
style->line.color = GDK_TO_UINT(color); style->line.color = GO_COLOR_FROM_GDK(color);
} else { } else {
g_warning( "cannot parse color [%s]", info->color_str ); g_warning( "cannot parse color [%s]", info->color_str );
} }