From: Ian Douglas Scott <idscott@system76.com>
Date: Tue, 14 Dec 2021 17:31:26 +0000 (-0800)
Subject: gdk/wayland/surface: Remove `SURFACE_IS_TOPLEVEL`
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~9^2~104^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dac7a4f6e7be6f7c8a65416f0584ecb71c984468;p=gtk4.git

gdk/wayland/surface: Remove `SURFACE_IS_TOPLEVEL`

Always defined to `TRUE`.
---

diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index e867ec8118..4f02ca08b2 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -71,8 +71,6 @@
  * The Wayland implementation of `GdkPopup`.
  */
 
-#define SURFACE_IS_TOPLEVEL(surface)  TRUE
-
 #define MAX_WL_BUFFER_SIZE (4083) /* 4096 minus header, string argument length and NUL byte */
 
 typedef enum _PopupState
@@ -3734,8 +3732,7 @@ gdk_wayland_surface_set_geometry_hints (GdkWaylandSurface  *impl,
   int min_width, min_height;
   int max_width, max_height;
 
-  if (GDK_SURFACE_DESTROYED (impl) ||
-      !SURFACE_IS_TOPLEVEL (impl))
+  if (GDK_SURFACE_DESTROYED (impl))
     return;
 
   display_wayland = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (GDK_SURFACE (impl)));
@@ -3894,8 +3891,7 @@ gdk_wayland_toplevel_minimize (GdkToplevel *toplevel)
   GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
   GdkWaylandDisplay *display_wayland;
 
-  if (GDK_SURFACE_DESTROYED (surface) ||
-      !SURFACE_IS_TOPLEVEL (surface))
+  if (GDK_SURFACE_DESTROYED (surface))
     return TRUE;
 
   if (!is_realized_toplevel (GDK_WAYLAND_SURFACE (surface)))
@@ -4115,8 +4111,7 @@ gdk_wayland_toplevel_begin_resize (GdkToplevel    *toplevel,
   GdkEventSequence *sequence;
   uint32_t resize_edges, serial;
 
-  if (GDK_SURFACE_DESTROYED (surface) ||
-      !SURFACE_IS_TOPLEVEL (surface))
+  if (GDK_SURFACE_DESTROYED (surface))
     return;
 
   switch (edge)
@@ -4201,8 +4196,7 @@ gdk_wayland_toplevel_begin_move (GdkToplevel *toplevel,
   GdkEventSequence *sequence;
   uint32_t serial;
 
-  if (GDK_SURFACE_DESTROYED (surface) ||
-      !SURFACE_IS_TOPLEVEL (surface))
+  if (GDK_SURFACE_DESTROYED (surface))
     return;
 
   impl = GDK_WAYLAND_SURFACE (surface);