[gtk/wip/chergert/quartz4u: 130/146] macos: track upstream changes

[Christian Hergert <chergert src gnome org>]

commit 8a8c7ea23be53443c77a646695993a05d1747db2
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jun 11 11:59:19 2020 -0700

    macos: track upstream changes

 gdk/macos/gdkmacosdevice.c       | 22 +++-------------------
 gdk/macos/gdkmacospopupsurface.c |  2 --
 2 files changed, 3 insertions(+), 21 deletions(-)
---
diff --git a/gdk/macos/gdkmacosdevice.c b/gdk/macos/gdkmacosdevice.c
index 17702d3ff3..33ac9fe3be 100644
--- a/gdk/macos/gdkmacosdevice.c
+++ b/gdk/macos/gdkmacosdevice.c
@@ -67,8 +67,7 @@ static GdkSurface *
 gdk_macos_device_surface_at_position (GdkDevice       *device,
                                       gdouble         *win_x,
                                       gdouble         *win_y,
-                                      GdkModifierType *state,
-                                      gboolean         get_toplevel)
+                                      GdkModifierType *state)
 {
   GdkMacosDisplay *display;
   GdkMacosSurface *surface;
@@ -127,20 +126,6 @@ gdk_macos_device_ungrab (GdkDevice *device,
   _gdk_display_device_grab_update (display, device, device, 0);
 }
 
-static gboolean
-gdk_macos_device_get_history (GdkDevice      *device,
-                              GdkSurface     *surface,
-                              guint32         start,
-                              guint32         stop,
-                              GdkTimeCoord ***events,
-                              gint           *n_events)
-{
-  g_assert (GDK_IS_MACOS_DEVICE (device));
-  g_assert (GDK_IS_MACOS_SURFACE (surface));
-
-  return FALSE;
-}
-
 static void
 gdk_macos_device_get_state (GdkDevice       *device,
                             GdkSurface      *surface,
@@ -202,7 +187,6 @@ gdk_macos_device_class_init (GdkMacosDeviceClass *klass)
 {
   GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
 
-  device_class->get_history = gdk_macos_device_get_history;
   device_class->get_state = gdk_macos_device_get_state;
   device_class->grab = gdk_macos_device_grab;
   device_class->query_state = gdk_macos_device_query_state;
@@ -214,6 +198,6 @@ gdk_macos_device_class_init (GdkMacosDeviceClass *klass)
 static void
 gdk_macos_device_init (GdkMacosDevice *self)
 {
-  _gdk_device_add_axis (GDK_DEVICE (self), NULL, GDK_AXIS_X, 0, 0, 1);
-  _gdk_device_add_axis (GDK_DEVICE (self), NULL, GDK_AXIS_Y, 0, 0, 1);
+  _gdk_device_add_axis (GDK_DEVICE (self), GDK_AXIS_X, 0, 0, 1);
+  _gdk_device_add_axis (GDK_DEVICE (self), GDK_AXIS_Y, 0, 0, 1);
 }
diff --git a/gdk/macos/gdkmacospopupsurface.c b/gdk/macos/gdkmacospopupsurface.c
index 4f9d16140f..520a717dfc 100644
--- a/gdk/macos/gdkmacospopupsurface.c
+++ b/gdk/macos/gdkmacospopupsurface.c
@@ -88,8 +88,6 @@ gdk_macos_popup_surface_layout (GdkMacosPopupSurface *self,
 static void
 show_popup (GdkMacosPopupSurface *self)
 {
-  NSWindow *nswindow = _gdk_macos_surface_get_native (GDK_MACOS_SURFACE (self));
-
   _gdk_macos_surface_show (GDK_MACOS_SURFACE (self));
 }