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

[Bruno Coudoin <bcoudoin src gnome org>]

commit 7af5302b79f219c60849b56a891f340246ab64cd
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun Oct 24 17:22:04 2010 +0200

    Revert "Merges changes from upstream goocanvas to make us compile again with gtk 2.22"
    
    This reverts commit ba6e1896b0853456a4c7648574ae400e289c2421.
    
    I have problems building a new compilation environment for Windows. I prefer to stick
    to the one I have.

 src/goocanvas/src/goocanvas.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/goocanvas/src/goocanvas.c b/src/goocanvas/src/goocanvas.c
index 824647e..b2203ac 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_can_focus (GTK_WIDGET (canvas), TRUE);
+  GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
 
   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_realized (GTK_WIDGET (canvas), TRUE);
+  GTK_WIDGET_SET_FLAGS (canvas, GTK_REALIZED);
 
   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_mapped (widget, TRUE);
+  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
 
   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,6 +3258,8 @@ 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);
@@ -3272,6 +3274,8 @@ 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);