[gtk/wip/matthiasc/focus3: 38/40] Use root in gdk_synthesize_crossing_events



commit 6ddb61119a8f185d6268d4927fbb53100e2305db
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Mar 16 03:06:29 2019 -0400

    Use root in gdk_synthesize_crossing_events

 gtk/gtkmain.c          | 8 ++++----
 gtk/gtkwidgetprivate.h | 2 +-
 gtk/gtkwindow.c        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 92873dee1e..b435c489a3 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1484,7 +1484,7 @@ synth_crossing (GtkWidget       *widget,
 }
 
 void
-gtk_synthesize_crossing_events (GtkWindow       *toplevel,
+gtk_synthesize_crossing_events (GtkRoot         *toplevel,
                                 GtkWidget       *old_target,
                                 GtkWidget       *new_target,
                                 GdkEvent        *event,
@@ -1655,7 +1655,7 @@ handle_pointing_event (GdkEvent *event)
       old_target = update_pointer_focus_state (toplevel, event, NULL);
 
       if (event->any.type == GDK_LEAVE_NOTIFY)
-        gtk_synthesize_crossing_events (toplevel, old_target, NULL,
+        gtk_synthesize_crossing_events (GTK_ROOT (toplevel), old_target, NULL,
                                         event, event->crossing.mode);
       break;
     case GDK_ENTER_NOTIFY:
@@ -1680,7 +1680,7 @@ handle_pointing_event (GdkEvent *event)
           if (!gtk_window_lookup_pointer_focus_implicit_grab (toplevel, device,
                                                               sequence))
             {
-              gtk_synthesize_crossing_events (toplevel, old_target, target,
+              gtk_synthesize_crossing_events (GTK_ROOT (toplevel), old_target, target,
                                               event, GDK_CROSSING_NORMAL);
             }
 
@@ -1710,7 +1710,7 @@ handle_pointing_event (GdkEvent *event)
           new_target = gtk_widget_pick (GTK_WIDGET (toplevel), x, y);
           if (new_target == NULL)
             new_target = GTK_WIDGET (toplevel);
-          gtk_synthesize_crossing_events (toplevel, target, new_target, event,
+          gtk_synthesize_crossing_events (GTK_ROOT (toplevel), target, new_target, event,
                                           GDK_CROSSING_UNGRAB);
           gtk_window_maybe_update_cursor (toplevel, NULL, device);
         }
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 49d7fcad8b..9ede6b8b79 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -242,7 +242,7 @@ GdkSurface *       _gtk_widget_get_device_surface          (GtkWidget *widget,
                                                             GdkDevice *device);
 GList *           _gtk_widget_list_devices                 (GtkWidget *widget);
 
-void              gtk_synthesize_crossing_events           (GtkWindow       *toplevel,
+void              gtk_synthesize_crossing_events           (GtkRoot         *toplevel,
                                                             GtkWidget       *from,
                                                             GtkWidget       *to,
                                                             GdkEvent        *event,
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 976777717d..bc2a53cff2 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -7191,7 +7191,7 @@ gtk_window_set_focus (GtkWindow *window,
   if (event->any.surface)
     g_object_ref (event->any.surface);
 
-  gtk_synthesize_crossing_events (window, old_focus, focus, event, GDK_CROSSING_NORMAL);
+  gtk_synthesize_crossing_events (GTK_ROOT (window), old_focus, focus, event, GDK_CROSSING_NORMAL);
 
   g_object_unref (event);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]