From: Matthias Clasen Date: Mon, 18 May 2020 01:52:15 +0000 (-0400) Subject: gdk: Drop gdk_display_supports_shapes X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~17^2~11^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=287c40276a8a3e39a76b12aa56f8520a04ecdf23;p=gtk4.git 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 6f3e87246b..547db24d89 100644 --- 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 98007d271d..00d4a79b38 100644 --- 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 eb4addc9da..de17527e15 100644 --- 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 e7d65cf10b..4dd046e91d 100644 --- 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 4e7d6e7ff5..0ba63c3358 100644 --- 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 e42aec13df..ca608cee0a 100644 --- 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 03d914c023..ed579f34dc 100644 --- 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 d060e08690..f5c4f630a3 100644 --- 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;