[gcompris/gcomprixogoo] Merges changes from upstream goocanvas to make us compile again with gtk 2.22

[Bruno Coudoin <bcoudoin src gnome org>]

commit ba6e1896b0853456a4c7648574ae400e289c2421
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun Oct 17 14:13:59 2010 +0200

    Merges changes from upstream goocanvas to make us compile again with gtk 2.22

 src/goocanvas/src/goocanvas.c          |   14 +++++---------
 src/goocanvas/src/goocanvasenumtypes.c |    4 ++--
 src/goocanvas/src/goocanvasenumtypes.h |    4 ++--
 3 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/src/goocanvas/src/goocanvas.c b/src/goocanvas/src/goocanvas.c
index b2203ac..824647e 100644
--- a/src/goocanvas/src/goocanvas.c
+++ b/src/goocanvas/src/goocanvas.c
@@ -478,7 +478,7 @@ goo_canvas_init (GooCanvas *canvas)
 
   /* We set GTK_CAN_FOCUS by default, so it works as people expect.
      Though developers can turn this off if not needed for efficiency. */
-  GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus (GTK_WIDGET (canvas), TRUE);
 
   canvas->scale_x = 1.0;
   canvas->scale_y = 1.0;
@@ -1454,7 +1454,7 @@ goo_canvas_realize (GtkWidget *widget)
 
   canvas = GOO_CANVAS (widget);
   priv = GOO_CANVAS_GET_PRIVATE (canvas);
-  GTK_WIDGET_SET_FLAGS (canvas, GTK_REALIZED);
+  gtk_widget_set_realized (GTK_WIDGET (canvas), TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;
@@ -1566,7 +1566,7 @@ goo_canvas_map (GtkWidget *widget)
 
   canvas = GOO_CANVAS (widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, TRUE);
 
   tmp_list = canvas->widget_items;
   while (tmp_list)
@@ -2722,7 +2722,7 @@ goo_canvas_expose_event (GtkWidget      *widget,
 
   if (event->window != canvas->canvas_window)
     return FALSE;
-
+#if 0
   /* Clear the background. */
   if (canvas->clear_background)
     {
@@ -2731,7 +2731,7 @@ goo_canvas_expose_event (GtkWidget      *widget,
 			  event->area.x, event->area.y,
 			  event->area.width, event->area.height);
     }
-
+#endif
   cr = goo_canvas_create_cairo_context (canvas);
 
   if (canvas->need_update)
@@ -3258,8 +3258,6 @@ goo_canvas_focus_in        (GtkWidget      *widget,
 {
   GooCanvas *canvas = GOO_CANVAS (widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-
   if (canvas->focused_item)
     return propagate_event (canvas, canvas->focused_item,
 			    "focus_in_event", (GdkEvent*) event);
@@ -3274,8 +3272,6 @@ goo_canvas_focus_out       (GtkWidget      *widget,
 {
   GooCanvas *canvas = GOO_CANVAS (widget);
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
   if (canvas->focused_item)
     return propagate_event (canvas, canvas->focused_item,
 			    "focus_out_event", (GdkEvent*) event);
diff --git a/src/goocanvas/src/goocanvasenumtypes.c b/src/goocanvas/src/goocanvasenumtypes.c
index 7b64fc8..7c35055 100644
--- a/src/goocanvas/src/goocanvasenumtypes.c
+++ b/src/goocanvas/src/goocanvasenumtypes.c
@@ -1,5 +1,5 @@
 
-/* Generated data (by glib-mkenums) */
+
 
 #include <glib-object.h>
 #include "goocanvas.h"
@@ -91,5 +91,5 @@ goo_canvas_path_command_type_get_type (void)
   return etype;
 }
 
-/* Generated data ends here */
+
 
diff --git a/src/goocanvas/src/goocanvasenumtypes.h b/src/goocanvas/src/goocanvasenumtypes.h
index ef0ccee..0883f73 100644
--- a/src/goocanvas/src/goocanvasenumtypes.h
+++ b/src/goocanvas/src/goocanvasenumtypes.h
@@ -1,5 +1,5 @@
 
-/* Generated data (by glib-mkenums) */
+
 
 #ifndef __GOO_CANVAS_ENUM_TYPES_H__
 #define __GOO_CANVAS_ENUM_TYPES_H__
@@ -29,5 +29,5 @@ G_END_DECLS
 
 #endif /* __GOO_CANVAS_ENUM_TYPES_H__ */
 
-/* Generated data ends here */
+