Fix all remaining GTK3 issues.

Work around the issue of GnomeCanvasItem amending its own flags to
GtkObject::flags (which is sealed) by giving it its own flags field.
This breaks libgnomecanvas ABI and API, but I see no other way.

This commit didn't work the first time because gnome-pilot libraries
were still pulling in the system-wide libgnomecanvas, and that was
interfereing with our bundled version which has a different ABI.
But gnome-pilot integration was dropped in the previous commit, so
everything is now using the bundled libgnomecanvas.

1 files changed, 5 insertions, 1 deletions

diff --git a/libgnomecanvas/gnome-canvas-line.c b/libgnomecanvas/gnome-canvas-line.c
index 48cafb71c7..fa7c74ccc1 100644
--- a/libgnomecanvas/gnome-canvas-line.c
+++ b/libgnomecanvas/gnome-canvas-line.c
@@ -1096,14 +1096,18 @@ gnome_canvas_line_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_pa
 static void
 gnome_canvas_line_realize (GnomeCanvasItem *item)
 {
+	GtkLayout *layout;
 	GnomeCanvasLine *line;
+	GdkWindow *bin_window;
 
 	line = GNOME_CANVAS_LINE (item);
 
 	if (parent_class->realize)
 		(* parent_class->realize) (item);
 
-	line->gc = gdk_gc_new (item->canvas->layout.bin_window);
+	layout = GTK_LAYOUT (item->canvas);
+	bin_window = gtk_layout_get_bin_window (layout);
+	line->gc = gdk_gc_new (bin_window);
 
 #if 0
 	(* GNOME_CANVAS_ITEM_CLASS (item->object.klass)->update) (item, NULL, NULL, 0);