1 files changed, 9 insertions, 9 deletions

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 645f1352d8..36167d6304 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -636,7 +636,7 @@ _gdk_wayland_display_open (const gchar *display_name)
 static void
 destroy_toplevel (gpointer data)
 {
-  _gdk_window_destroy (GDK_WINDOW (data), FALSE);
+  _gdk_surface_destroy (GDK_SURFACE (data), FALSE);
 }
 
 static void
@@ -714,7 +714,7 @@ gdk_wayland_display_get_name (GdkDisplay *display)
 
 void
 gdk_wayland_display_system_bell (GdkDisplay *display,
-                                 GdkWindow  *window)
+                                 GdkSurface  *window)
 {
   GdkWaylandDisplay *display_wayland;
   struct gtk_surface1 *gtk_surface;
@@ -728,7 +728,7 @@ gdk_wayland_display_system_bell (GdkDisplay *display,
     return;
 
   if (window)
-    gtk_surface = gdk_wayland_window_get_gtk_surface (window);
+    gtk_surface = gdk_wayland_surface_get_gtk_surface (window);
   else
     gtk_surface = NULL;
 
@@ -798,7 +798,7 @@ gdk_wayland_display_has_pending (GdkDisplay *display)
   return FALSE;
 }
 
-static GdkWindow *
+static GdkSurface *
 gdk_wayland_display_get_default_group (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
@@ -917,15 +917,15 @@ gdk_wayland_display_get_monitor (GdkDisplay *display,
 
 static GdkMonitor *
 gdk_wayland_display_get_monitor_at_window (GdkDisplay *display,
-                                           GdkWindow  *window)
+                                           GdkSurface  *window)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
   struct wl_output *output;
   int i;
 
-  g_return_val_if_fail (GDK_IS_WAYLAND_WINDOW (window), NULL);
+  g_return_val_if_fail (GDK_IS_WAYLAND_SURFACE (window), NULL);
 
-  output = gdk_wayland_window_get_wl_output (window);
+  output = gdk_wayland_surface_get_wl_output (window);
   if (output == NULL)
     return NULL;
 
@@ -953,7 +953,7 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass *class)
   object_class->dispose = gdk_wayland_display_dispose;
   object_class->finalize = gdk_wayland_display_finalize;
 
-  display_class->window_type = gdk_wayland_window_get_type ();
+  display_class->window_type = gdk_wayland_surface_get_type ();
 
 #ifdef GDK_RENDERING_VULKAN
   display_class->vk_context_type = GDK_TYPE_WAYLAND_VULKAN_CONTEXT;
@@ -1848,7 +1848,7 @@ static void
 update_scale (GdkDisplay *display)
 {
   g_list_foreach (gdk_wayland_display_get_toplevel_windows (display),
-                  (GFunc)gdk_wayland_window_update_scale,
+                  (GFunc)gdk_wayland_surface_update_scale,
                   NULL);
 }