[goffice] test for gtk_layout_get_bin_window

[Jean Bréfort <jbrefort src gnome org>]

commit 3b9f4b48c00ba16641463112953d7530cdd949ad
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Aug 19 21:38:50 2009 +0200

    test for gtk_layout_get_bin_window

 ChangeLog                      |    7 ++++++
 configure.in                   |    2 +-
 goffice/canvas/goc-canvas.c    |    4 +++
 goffice/canvas/goc-line-impl.h |   41 ----------------------------------------
 goffice/graph/gog-chart.c      |    2 +-
 5 files changed, 13 insertions(+), 43 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e4e41b6..ebfaeba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-08-19  Jean Brefort  <jean brefort normalesup org>
 
+	* configure.in: test for gtk_layout_get_bin_window.
+	* goffice/canvas/goc-canvas.c: define gtk_layout_get_bin_window if needed.
+	* goffice/canvas/goc-line-impl.h: removed obsolete.
+	* goffice/graph/gog-chart.c (role_plot_can_add): fix signature.
+
+2009-08-19  Jean Brefort  <jean brefort normalesup org>
+
 	* goffice/canvas/Makefile.am: add gog-polyline.[c,h].
 	* goffice/canvas/*.[c,h]: fixed various issues.
 	* goffice/grph/gog-equation.c: make it compile with latest lasem code.
diff --git a/configure.in b/configure.in
index 61101c5..8bc9784 100644
--- a/configure.in
+++ b/configure.in
@@ -417,7 +417,7 @@ SAVE_LIBS=$LIBS
 LIBS="$GOFFICE_LIBS $LIBS"
 AC_CHECK_FUNCS(cairo_surface_set_fallback_resolution cairo_ps_surface_set_eps)
 AC_CHECK_FUNCS(g_file_new_for_commandline_arg g_file_new_for_uri g_hash_table_iter_init)
-AC_CHECK_FUNCS(g_content_type_from_mime_type)
+AC_CHECK_FUNCS(g_content_type_from_mime_type gtk_layout_get_bin_window)
 LIBS=$SAVE_LIBS
 
 SAVE_CFLAGS=$CFLAGS
diff --git a/goffice/canvas/goc-canvas.c b/goffice/canvas/goc-canvas.c
index 8a3a929..084f8de 100644
--- a/goffice/canvas/goc-canvas.c
+++ b/goffice/canvas/goc-canvas.c
@@ -25,6 +25,10 @@
 #include <gsf/gsf-impl-utils.h>
 #include <math.h>
 
+#ifndef HAVE_GTK_LAYOUT_GET_BIN_WINDOW
+#       define gtk_layout_get_bin_window(x) (x)->bin_window
+#endif
+
 static GObjectClass *parent_klass;
 
 static gboolean
diff --git a/goffice/graph/gog-chart.c b/goffice/graph/gog-chart.c
index 793491d..b4a72ec 100644
--- a/goffice/graph/gog-chart.c
+++ b/goffice/graph/gog-chart.c
@@ -213,7 +213,7 @@ gog_chart_children_reordered (GogObject *obj)
 }
 
 static gboolean
-role_plot_can_add (GogObject *parent, GogObject *child)
+role_plot_can_add (GogObject const *parent)
 {
 	GogChart *chart = GOG_CHART (parent);
 	return (chart->axis_set & (1 << GOG_AXIS_Z)) == 0 || g_slist_length (chart->plots) == 0;