Drop gdk_display_get_default_screen

Also remove the backend implementations.
This api is no longer used.

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index e05feb37eedc91d4639a7a9e9ffd4904913dc5bd..a3a2fd75b0ced5500be0a1ad7deef11afeca945b 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1155,24 +1155,6 @@ gdk_display_get_name (GdkDisplay *display)
   return GDK_DISPLAY_GET_CLASS (display)->get_name (display);
 }
 
-/**
- * gdk_display_get_default_screen:
- * @display: a #GdkDisplay
- *
- * Get the default #GdkScreen for @display.
- *
- * Returns: (transfer none): the default #GdkScreen object for @display
- *
- * Since: 2.2
- */
-GdkScreen *
-gdk_display_get_default_screen (GdkDisplay *display)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-
-  return GDK_DISPLAY_GET_CLASS (display)->get_default_screen (display);
-}
-
 /**
  * gdk_display_beep:
  * @display: a #GdkDisplay

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index d9168481a52f00727d88de15c5740e4bb3d3edc7..d8aad24a8962a28283cadd6a148aad742707a9ca 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -47,9 +47,6 @@ GdkDisplay *gdk_display_open                (const gchar *display_name);
 GDK_AVAILABLE_IN_ALL
 const gchar * gdk_display_get_name         (GdkDisplay *display);
 
-GDK_AVAILABLE_IN_ALL
-GdkScreen * gdk_display_get_default_screen (GdkDisplay  *display);
-
 GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_device_is_grabbed  (GdkDisplay  *display,
                                             GdkDevice   *device);

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index b526b265b1e26a8910a92d205886168b59639278..0215e0db2a6d812a651cebc185b9a5259276b5be 100644 (file)
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -117,7 +117,6 @@ struct _GdkDisplayClass
   const char *vk_extension_name; /* Name of required windowing vulkan extension or %NULL (default) if Vulkan isn't supported */
 
   const gchar *              (*get_name)           (GdkDisplay *display);
-  GdkScreen *                (*get_default_screen) (GdkDisplay *display);
   void                       (*beep)               (GdkDisplay *display);
   void                       (*sync)               (GdkDisplay *display);
   void                       (*flush)              (GdkDisplay *display);

diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
index 944212bf8c18b0056dc2528bd5bf2ad080a83466..c37a5e8ae164cf418e5c89609ebca898c98dbcef 100644 (file)
--- a/gdk/quartz/gdkdisplay-quartz.c
+++ b/gdk/quartz/gdkdisplay-quartz.c
@@ -92,12 +92,6 @@ gdk_quartz_display_get_name (GdkDisplay *display)
   return display_name;
 }
 
-static GdkScreen *
-gdk_quartz_display_get_default_screen (GdkDisplay *display)
-{
-  return _gdk_screen;
-}
-
 static void
 gdk_quartz_display_beep (GdkDisplay *display)
 {
@@ -266,7 +260,6 @@ gdk_quartz_display_class_init (GdkQuartzDisplayClass *class)
   display_class->window_type = GDK_TYPE_QUARTZ_WINDOW;
 
   display_class->get_name = gdk_quartz_display_get_name;
-  display_class->get_default_screen = gdk_quartz_display_get_default_screen;
   display_class->beep = gdk_quartz_display_beep;
   display_class->sync = gdk_quartz_display_sync;
   display_class->flush = gdk_quartz_display_flush;

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 5c6fcdc19b1ccdfd287faa6441330f0967cbb854..e980a97d4611a6610ec2d047aa2e11bc68ffd89a 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -701,14 +701,6 @@ gdk_wayland_display_get_name (GdkDisplay *display)
   return name;
 }
 
-static GdkScreen *
-gdk_wayland_display_get_default_screen (GdkDisplay *display)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-
-  return GDK_WAYLAND_DISPLAY (display)->screen;
-}
-
 void
 gdk_wayland_display_system_bell (GdkDisplay *display,
                                  GdkWindow  *window)
@@ -1012,7 +1004,6 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass *class)
 #endif
 
   display_class->get_name = gdk_wayland_display_get_name;
-  display_class->get_default_screen = gdk_wayland_display_get_default_screen;
   display_class->beep = gdk_wayland_display_beep;
   display_class->sync = gdk_wayland_display_sync;
   display_class->flush = gdk_wayland_display_flush;

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index ac196070fb38d8323ee99b55e726b9d4dc79a43d..2fd993396421a36b90856f418c26463bc5ae1b90 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -530,14 +530,6 @@ gdk_win32_display_get_name (GdkDisplay *display)
   return display_name_cache;
 }
 
-static GdkScreen *
-gdk_win32_display_get_default_screen (GdkDisplay *display)
-{
-  g_return_val_if_fail (GDK_IS_WIN32_DISPLAY (display), NULL);
-
-  return GDK_WIN32_DISPLAY (display)->screen;
-}
-
 static GdkWindow *
 gdk_win32_display_get_default_group (GdkDisplay *display)
 {
@@ -1256,7 +1248,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
   display_class->window_type = GDK_TYPE_WIN32_WINDOW;
 
   display_class->get_name = gdk_win32_display_get_name;
-  display_class->get_default_screen = gdk_win32_display_get_default_screen;
   display_class->beep = gdk_win32_display_beep;
   display_class->sync = gdk_win32_display_sync;
   display_class->flush = gdk_win32_display_flush;

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index c7a99ae548d7f15cbbc947650f206b074d9c8d4b..fc59079e5ec9d7593aeadb72873cf155063a0089 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1859,12 +1859,6 @@ gdk_x11_display_get_name (GdkDisplay *display)
   return (gchar *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay);
 }
 
-static GdkScreen *
-gdk_x11_display_get_default_screen (GdkDisplay *display)
-{
-  return GDK_X11_DISPLAY (display)->screen;
-}
-
 gboolean
 _gdk_x11_display_is_root_window (GdkDisplay *display,
                                 Window      xroot_window)
@@ -3144,7 +3138,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
 #endif
 
   display_class->get_name = gdk_x11_display_get_name;
-  display_class->get_default_screen = gdk_x11_display_get_default_screen;
   display_class->beep = gdk_x11_display_beep;
   display_class->sync = gdk_x11_display_sync;
   display_class->flush = gdk_x11_display_flush;