[gtk/wip/matthiasc/popup4: 82/94] window: Set cursor on the right surface

[Matthias Clasen <matthiasc src gnome org>]

commit d7839073d6d41a9bf022da95d49dee9e929d7ec5
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Apr 26 23:48:13 2019 +0000

    window: Set cursor on the right surface
    
    This fixes cursors for entries in popovers.

 gtk/gtkwindow.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 03090e7beb..2502cdfabc 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -10071,6 +10071,9 @@ update_cursor (GtkRoot   *toplevel,
                GtkWidget *target)
 {
   GdkCursor *cursor = NULL;
+  GdkSurface *surface;
+
+  surface = gtk_widget_get_surface (target);
 
   if (grab_widget && !gtk_widget_is_ancestor (target, grab_widget))
     {
@@ -10098,8 +10101,7 @@ update_cursor (GtkRoot   *toplevel,
         }
     }
 
-  gdk_surface_set_device_cursor (gtk_widget_get_surface (GTK_WIDGET (toplevel)),
-                                 device, cursor);
+  gdk_surface_set_device_cursor (surface, device, cursor);
 }
 
 void