[gtk+/multitouch: 13/121] gtk: Propagate ::captured-event up the hierarchy for crossing events

[Carlos Garnacho <carlosg src gnome org>]

commit e425c514ec7d22be8178817bfb7f3a19800e6dc6
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Oct 24 11:00:31 2011 +0200

    gtk: Propagate ::captured-event up the hierarchy for crossing events

 gtk/gtkmain.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 4ee4e42..d535d68 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1705,18 +1705,18 @@ gtk_main_do_event (GdkEvent *event)
       _gtk_widget_set_device_window (event_widget,
                                      gdk_event_get_device (event),
                                      event->any.window);
-      if (gtk_widget_is_sensitive (grab_widget))
-        if (!_gtk_widget_captured_event (grab_widget, event))
-          gtk_widget_event (grab_widget, event);
+      if (gtk_widget_is_sensitive (grab_widget) &&
+	  !gtk_propagate_captured_event (grab_widget, event, topmost_widget))
+        gtk_widget_event (grab_widget, event);
       break;
 
     case GDK_LEAVE_NOTIFY:
       _gtk_widget_set_device_window (event_widget,
                                      gdk_event_get_device (event),
                                      NULL);
-      if (gtk_widget_is_sensitive (grab_widget))
-        if (!_gtk_widget_captured_event (grab_widget, event))
-          gtk_widget_event (grab_widget, event);
+      if (gtk_widget_is_sensitive (grab_widget) &&
+          !gtk_propagate_captured_event (grab_widget, event, topmost_widget))
+        gtk_widget_event (grab_widget, event);
       break;
 
     case GDK_DRAG_STATUS: