From 7f0b5297c669dcb92a8c0ca12eb90dcd67391937 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 1 Nov 2017 18:17:35 -0400 Subject: [PATCH] Drop gdk_display_get_default_screen Also remove the backend implementations. This api is no longer used. --- gdk/gdkdisplay.c | 18 ------------------ gdk/gdkdisplay.h | 3 --- gdk/gdkdisplayprivate.h | 1 - gdk/quartz/gdkdisplay-quartz.c | 7 ------- gdk/wayland/gdkdisplay-wayland.c | 9 --------- gdk/win32/gdkdisplay-win32.c | 9 --------- gdk/x11/gdkdisplay-x11.c | 7 ------- 7 files changed, 54 deletions(-) diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index e05feb37ee..a3a2fd75b0 100644 --- 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 d9168481a5..d8aad24a89 100644 --- 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 b526b265b1..0215e0db2a 100644 --- 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 944212bf8c..c37a5e8ae1 100644 --- 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 5c6fcdc19b..e980a97d46 100644 --- 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 ac196070fb..2fd9933964 100644 --- 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 c7a99ae548..fc59079e5e 100644 --- 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;