[gtk/present-toplevel-2: 149/178] surface: Drop unused restack_toplevel vfunc



commit 61a3654ea0249a53d7d8739db7e63a059bcbfe53
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Mar 9 10:00:03 2020 -0700

    surface: Drop unused restack_toplevel vfunc
    
    The only backend that has a non-empty implementation
    and actually restacks windows is the x11, one, so
    just use the functionality directly there.

 gdk/broadway/gdksurface-broadway.c |  9 ---------
 gdk/gdksurfaceprivate.h            |  4 ----
 gdk/quartz/gdksurface-quartz.c     | 20 --------------------
 gdk/wayland/gdksurface-wayland.c   |  8 --------
 gdk/win32/gdksurface-win32.c       |  9 ---------
 gdk/x11/gdksurface-x11.c           |  1 -
 6 files changed, 51 deletions(-)
---
diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c
index 21bbe73ad3..ec1f195a18 100644
--- a/gdk/broadway/gdksurface-broadway.c
+++ b/gdk/broadway/gdksurface-broadway.c
@@ -564,13 +564,6 @@ gdk_broadway_surface_present_popup (GdkSurface     *surface,
   return GDK_SURFACE_IS_MAPPED (surface);
 }
 
-static void
-gdk_broadway_surface_restack_toplevel (GdkSurface *surface,
-                                       GdkSurface *sibling,
-                                       gboolean   above)
-{
-}
-
 static void
 gdk_broadway_surface_lower (GdkSurface *surface)
 {
@@ -935,7 +928,6 @@ gdk_broadway_surface_update_popups (GdkSurface *parent)
         gdk_broadway_surface_move_resize (popup,
                                           new_x, new_y,
                                           popup->width, popup->height);
-      gdk_broadway_surface_restack_toplevel (popup, parent, TRUE);
     }
 }
 
@@ -1429,7 +1421,6 @@ gdk_broadway_surface_class_init (GdkBroadwaySurfaceClass *klass)
   impl_class->withdraw = gdk_broadway_surface_withdraw;
   impl_class->raise = gdk_broadway_surface_raise;
   impl_class->lower = gdk_broadway_surface_lower;
-  impl_class->restack_toplevel = gdk_broadway_surface_restack_toplevel;
   impl_class->toplevel_resize = gdk_broadway_surface_toplevel_resize;
   impl_class->present_popup = gdk_broadway_surface_present_popup;
   impl_class->get_geometry = gdk_broadway_surface_get_geometry;
diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h
index e0cd1d9e13..0dfaa7a73a 100644
--- a/gdk/gdksurfaceprivate.h
+++ b/gdk/gdksurfaceprivate.h
@@ -119,10 +119,6 @@ struct _GdkSurfaceClass
   void         (* withdraw)             (GdkSurface       *surface);
   void         (* raise)                (GdkSurface       *surface);
   void         (* lower)                (GdkSurface       *surface);
-  void         (* restack_toplevel)     (GdkSurface       *surface,
-                                         GdkSurface       *sibling,
-                                         gboolean        above);
-
   void         (* toplevel_resize)      (GdkSurface      *surface,
                                          gint             width,
                                          gint             height);
diff --git a/gdk/quartz/gdksurface-quartz.c b/gdk/quartz/gdksurface-quartz.c
index cc21dedf23..bdcecc44af 100644
--- a/gdk/quartz/gdksurface-quartz.c
+++ b/gdk/quartz/gdksurface-quartz.c
@@ -1433,25 +1433,6 @@ gdk_surface_quartz_lower (GdkSurface *window)
     }
 }
 
-static void
-gdk_surface_quartz_restack_toplevel (GdkSurface *window,
-                                   GdkSurface *sibling,
-                                   gboolean   above)
-{
-  GdkSurfaceImplQuartz *impl;
-  gint sibling_num;
-
-  impl = GDK_SURFACE_IMPL_QUARTZ (sibling->impl);
-  sibling_num = [impl->toplevel windowNumber];
-
-  impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
-
-  if (above)
-    [impl->toplevel orderWindow:NSWindowAbove relativeTo:sibling_num];
-  else
-    [impl->toplevel orderWindow:NSWindowBelow relativeTo:sibling_num];
-}
-
 static void
 gdk_surface_quartz_get_geometry (GdkSurface *window,
                                 gint      *x,
@@ -2705,7 +2686,6 @@ gdk_surface_impl_quartz_class_init (GdkSurfaceImplQuartzClass *klass)
   impl_class->withdraw = gdk_surface_quartz_withdraw;
   impl_class->raise = gdk_surface_quartz_raise;
   impl_class->lower = gdk_surface_quartz_lower;
-  impl_class->restack_toplevel = gdk_surface_quartz_restack_toplevel;
   impl_class->toplevel_resize = gdk_surface_quartz_toplevel_resize;
   impl_class->present_popup = gdk_quartz_surface_present_popup;
   impl_class->get_geometry = gdk_surface_quartz_get_geometry;
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index 870e6c0052..c571de6e14 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -2568,13 +2568,6 @@ gdk_wayland_surface_lower (GdkSurface *surface)
 {
 }
 
-static void
-gdk_wayland_surface_restack_toplevel (GdkSurface *surface,
-                                      GdkSurface *sibling,
-                                      gboolean    above)
-{
-}
-
 static void
 gdk_wayland_surface_move_resize (GdkSurface *surface,
                                  gint        x,
@@ -3848,7 +3841,6 @@ gdk_wayland_surface_class_init (GdkWaylandSurfaceClass *klass)
   impl_class->withdraw = gdk_wayland_surface_withdraw;
   impl_class->raise = gdk_wayland_surface_raise;
   impl_class->lower = gdk_wayland_surface_lower;
-  impl_class->restack_toplevel = gdk_wayland_surface_restack_toplevel;
   impl_class->toplevel_resize = gdk_wayland_surface_toplevel_resize;
   impl_class->present_popup = gdk_wayland_surface_present_popup;
   impl_class->get_geometry = gdk_wayland_surface_get_geometry;
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 1463793ef8..bffb3e1748 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -1862,14 +1862,6 @@ gdk_win32_surface_get_root_coords (GdkSurface *window,
                           (ty + _gdk_offset_y) / impl->surface_scale));
 }
 
-static void
-gdk_win32_surface_restack_toplevel (GdkSurface *window,
-                                  GdkSurface *sibling,
-                                  gboolean   above)
-{
-       // ### TODO
-}
-
 static gboolean
 gdk_surface_win32_get_device_state (GdkSurface       *window,
                                    GdkDevice       *device,
@@ -5190,7 +5182,6 @@ gdk_win32_surface_class_init (GdkWin32SurfaceClass *klass)
   impl_class->withdraw = gdk_win32_surface_withdraw;
   impl_class->raise = gdk_win32_surface_raise;
   impl_class->lower = gdk_win32_surface_lower;
-  impl_class->restack_toplevel = gdk_win32_surface_restack_toplevel;
   impl_class->toplevel_resize = gdk_win32_surface_toplevel_resize;
   impl_class->present_popup = gdk_win32_surface_present_popup;
   impl_class->get_geometry = gdk_win32_surface_get_geometry;
diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index 36645deca7..48ac2d27eb 100644
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -4760,7 +4760,6 @@ gdk_x11_surface_class_init (GdkX11SurfaceClass *klass)
   impl_class->withdraw = gdk_x11_surface_withdraw;
   impl_class->raise = gdk_x11_surface_raise;
   impl_class->lower = gdk_x11_surface_lower;
-  impl_class->restack_toplevel = gdk_x11_surface_restack_toplevel;
   impl_class->toplevel_resize = gdk_x11_surface_toplevel_resize;
   impl_class->present_popup = gdk_x11_surface_present_popup;
   impl_class->get_geometry = gdk_x11_surface_get_geometry;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]