gdk: Drop gdk_display_supports_shapes

The apis to set shapes on surfaces are gone,
so there is no point in providing this information
on GdkDisplay.

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 6f3e87246b6a768a59b2b43c9604db1e73732934..547db24d89974d3512b68d6414f4fa1f8353355e 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -86,7 +86,6 @@ gdk_display_has_pending
 gdk_display_is_rgba
 gdk_display_is_composited
 gdk_display_get_default_group
-gdk_display_supports_shapes
 gdk_display_supports_input_shapes
 gdk_display_get_app_launch_context
 gdk_display_notify_startup_complete

diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index 98007d271d07311030720315d10155ab8fbcd034..00d4a79b3859b36b294eca0ca5ce205aa612fac4 100644 (file)
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -313,12 +313,6 @@ gdk_broadway_display_notify_startup_complete (GdkDisplay  *display,
 {
 }
 
-static gboolean
-gdk_broadway_display_supports_shapes (GdkDisplay *display)
-{
-  return FALSE;
-}
-
 static gboolean
 gdk_broadway_display_supports_input_shapes (GdkDisplay *display)
 {
@@ -452,7 +446,6 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class)
   display_class->has_pending = gdk_broadway_display_has_pending;
   display_class->queue_events = _gdk_broadway_display_queue_events;
   display_class->get_default_group = gdk_broadway_display_get_default_group;
-  display_class->supports_shapes = gdk_broadway_display_supports_shapes;
   display_class->supports_input_shapes = gdk_broadway_display_supports_input_shapes;
 
   display_class->get_next_serial = gdk_broadway_display_get_next_serial;

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index eb4addc9daa703ce23538e6077deafe8d892cd85..de17527e155c4dc73deee85d4c9d3a2490c3ff10 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1094,23 +1094,6 @@ gdk_display_get_primary_clipboard (GdkDisplay *display)
   return display->primary_clipboard;
 }
 
-/**
- * gdk_display_supports_shapes:
- * @display: a #GdkDisplay
- *
- * Returns %TRUE if gdk_surface_shape_combine_mask() can
- * be used to create shaped windows on @display.
- *
- * Returns: %TRUE if shaped windows are supported
- */
-gboolean
-gdk_display_supports_shapes (GdkDisplay *display)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
-
-  return GDK_DISPLAY_GET_CLASS (display)->supports_shapes (display);
-}
-
 /**
  * gdk_display_supports_input_shapes:
  * @display: a #GdkDisplay

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index e7d65cf10bf5c1818ba30440558ff75025ae62da..4dd046e91dd1f16b90cb8c5b660849160812f422 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -87,8 +87,6 @@ GdkClipboard *          gdk_display_get_clipboard               (GdkDisplay
 GDK_AVAILABLE_IN_ALL
 GdkClipboard *          gdk_display_get_primary_clipboard       (GdkDisplay     *display);
 
-GDK_AVAILABLE_IN_ALL
-gboolean gdk_display_supports_shapes           (GdkDisplay    *display);
 GDK_AVAILABLE_IN_ALL
 gboolean gdk_display_supports_input_shapes     (GdkDisplay    *display);
 GDK_AVAILABLE_IN_ALL

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 4e7d6e7ff50a31b96aca3d6f4be24aa129fd7fcc..0ba63c3358aaf054e507afb92e712fcacfd28e44 100644 (file)
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -123,8 +123,7 @@ struct _GdkDisplayClass
   gboolean                   (*has_pending)        (GdkDisplay *display);
   void                       (*queue_events)       (GdkDisplay *display);
   void                       (*make_default)       (GdkDisplay *display);
-  GdkSurface *                (*get_default_group)  (GdkDisplay *display);
-  gboolean                   (*supports_shapes)       (GdkDisplay *display);
+  GdkSurface *               (*get_default_group)  (GdkDisplay *display);
   gboolean                   (*supports_input_shapes) (GdkDisplay *display);
 
   GdkAppLaunchContext *      (*get_app_launch_context) (GdkDisplay *display);

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index e42aec13df33cf318917e0c0aacfb3d21959bc7c..ca608cee0a734a22303208c7c8e817bf9a2f649b 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -848,12 +848,6 @@ gdk_wayland_display_get_default_group (GdkDisplay *display)
   return NULL;
 }
 
-static gboolean
-gdk_wayland_display_supports_shapes (GdkDisplay *display)
-{
-  return FALSE;
-}
-
 static gboolean
 gdk_wayland_display_supports_input_shapes (GdkDisplay *display)
 {
@@ -1019,7 +1013,6 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass *class)
   display_class->has_pending = gdk_wayland_display_has_pending;
   display_class->queue_events = _gdk_wayland_display_queue_events;
   display_class->get_default_group = gdk_wayland_display_get_default_group;
-  display_class->supports_shapes = gdk_wayland_display_supports_shapes;
   display_class->supports_input_shapes = gdk_wayland_display_supports_input_shapes;
   display_class->get_app_launch_context = _gdk_wayland_display_get_app_launch_context;
   display_class->get_next_serial = gdk_wayland_display_get_next_serial;

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 03d914c023658d2a9f3e6ec606582e74aef304a7..ed579f34dcd2ed50052aa03324a9623f98375666 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -622,14 +622,6 @@ gdk_win32_display_get_default_group (GdkDisplay *display)
   return NULL;
 }
 
-static gboolean
-gdk_win32_display_supports_shapes (GdkDisplay *display)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
-
-  return TRUE;
-}
-
 static gboolean
 gdk_win32_display_supports_input_shapes (GdkDisplay *display)
 {
@@ -1080,7 +1072,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
   display_class->queue_events = _gdk_win32_display_queue_events;
   display_class->get_default_group = gdk_win32_display_get_default_group;
 
-  display_class->supports_shapes = gdk_win32_display_supports_shapes;
   display_class->supports_input_shapes = gdk_win32_display_supports_input_shapes;
 
   //? display_class->get_app_launch_context = _gdk_win32_display_get_app_launch_context;

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index d060e0869083979b7d7a485136a1088dc322d00a..f5c4f630a3af5650860701682cf89525e1938d2b 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2309,12 +2309,6 @@ gdk_x11_display_get_user_time (GdkDisplay *display)
   return GDK_X11_DISPLAY (display)->user_time;
 }
 
-static gboolean
-gdk_x11_display_supports_shapes (GdkDisplay *display)
-{
-  return GDK_X11_DISPLAY (display)->have_shapes;
-}
-
 static gboolean
 gdk_x11_display_supports_input_shapes (GdkDisplay *display)
 {
@@ -2945,7 +2939,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   display_class->has_pending = gdk_x11_display_has_pending;
   display_class->queue_events = _gdk_x11_display_queue_events;
   display_class->get_default_group = gdk_x11_display_get_default_group;
-  display_class->supports_shapes = gdk_x11_display_supports_shapes;
   display_class->supports_input_shapes = gdk_x11_display_supports_input_shapes;
   display_class->get_app_launch_context = _gdk_x11_display_get_app_launch_context;