[gtk/matthiasc/for-master: 7/18] win32: Stop using the query_state vfunc

[Matthias Clasen <matthiasc src gnome org>]

commit 9a29462e63b63ba857e2ed0e57997fb86253c9e9
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Aug 26 16:05:54 2020 -0400

    win32: Stop using the query_state vfunc

 gdk/win32/gdkdevice-virtual.c | 1 -
 gdk/win32/gdkdevice-win32.c   | 1 -
 gdk/win32/gdkdevice-wintab.c  | 1 -
 gdk/win32/gdksurface-win32.c  | 5 ++---
 4 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/gdk/win32/gdkdevice-virtual.c b/gdk/win32/gdkdevice-virtual.c
index ee852a9cd0..83742c7763 100644
--- a/gdk/win32/gdkdevice-virtual.c
+++ b/gdk/win32/gdkdevice-virtual.c
@@ -160,7 +160,6 @@ gdk_device_virtual_class_init (GdkDeviceVirtualClass *klass)
   GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
 
   device_class->set_surface_cursor = gdk_device_virtual_set_surface_cursor;
-  device_class->query_state = gdk_device_virtual_query_state;
   device_class->grab = gdk_device_virtual_grab;
   device_class->ungrab = gdk_device_virtual_ungrab;
   device_class->surface_at_position = _gdk_device_win32_surface_at_position;
diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c
index 1badd8a69f..2591d3af8a 100644
--- a/gdk/win32/gdkdevice-win32.c
+++ b/gdk/win32/gdkdevice-win32.c
@@ -224,7 +224,6 @@ gdk_device_win32_class_init (GdkDeviceWin32Class *klass)
   GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
 
   device_class->set_surface_cursor = gdk_device_win32_set_surface_cursor;
-  device_class->query_state = gdk_device_win32_query_state;
   device_class->grab = gdk_device_win32_grab;
   device_class->ungrab = gdk_device_win32_ungrab;
   device_class->surface_at_position = _gdk_device_win32_surface_at_position;
diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c
index 498fb2e1d6..6e94545767 100644
--- a/gdk/win32/gdkdevice-wintab.c
+++ b/gdk/win32/gdkdevice-wintab.c
@@ -230,7 +230,6 @@ gdk_device_wintab_class_init (GdkDeviceWintabClass *klass)
   GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
 
   device_class->set_surface_cursor = gdk_device_wintab_set_surface_cursor;
-  device_class->query_state = gdk_x11_device_xi2_query_state;
   device_class->grab = gdk_device_wintab_grab;
   device_class->ungrab = gdk_device_wintab_ungrab;
   device_class->surface_at_position = gdk_device_wintab_surface_at_position;
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 4078635148..4708ea7935 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -1734,9 +1734,8 @@ gdk_surface_win32_get_device_state (GdkSurface       *window,
 
   g_return_val_if_fail (window == NULL || GDK_IS_SURFACE (window), FALSE);
 
-  GDK_DEVICE_GET_CLASS (device)->query_state (device, window,
-                                              &child,
-                                              x, y, mask);
+  _gdk_device_win32_query_state (device, window, &child, x, y, mask);
+
   return (child != NULL);
 }