diff options
author | Dridi Boukelmoune <dridi@fedoraproject.org> | 2020-12-16 16:54:30 +0100 |
---|---|---|
committer | Dridi Boukelmoune <dridi@fedoraproject.org> | 2020-12-16 16:54:30 +0100 |
commit | e4f9cdc0d97086a5f5e393859b83c66a7b8428a9 (patch) | |
tree | 94ff62b9db46ac709eda49c58fd4f9523af70471 /common | |
parent | be5bfa2d2a3fefe9e64f8300c2b31833e581d166 (diff) | |
download | xfwm4-e4f9cdc0d97086a5f5e393859b83c66a7b8428a9.tar.gz |
build: Increase GTK+ requirement to 3.22
Since 4.14 this is the minimum version for all of Xfce, which allows to
remove a bunch of dead code.
Refs !3
Signed-off-by: Dridi Boukelmoune <dridi@fedoraproject.org>
Diffstat (limited to 'common')
-rw-r--r-- | common/xfwm-common.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/common/xfwm-common.c b/common/xfwm-common.c index ce1110e1d..ce4b30b40 100644 --- a/common/xfwm-common.c +++ b/common/xfwm-common.c @@ -52,7 +52,6 @@ xfwm_widget_reparent (GtkWidget *widget, void xfwm_get_screen_dimensions (gint *width, gint *height) { -#if GTK_CHECK_VERSION(3, 22, 0) GdkDisplay *display; GdkMonitor *monitor; GdkRectangle geometry; @@ -65,12 +64,6 @@ xfwm_get_screen_dimensions (gint *width, gint *height) *width = geometry.width; if (height != NULL) *height = geometry.height; -#else - if (width != NULL) - *width = gdk_screen_width (); - if (height != NULL) - *height = gdk_screen_height (); -#endif } @@ -97,7 +90,6 @@ xfwm_get_monitor_geometry (GdkScreen *screen, gboolean scaled) { gint scale; -#if GTK_CHECK_VERSION(3, 22, 0) GdkDisplay *display; GdkMonitor *monitor; @@ -105,10 +97,6 @@ xfwm_get_monitor_geometry (GdkScreen *screen, monitor = gdk_display_get_monitor (display, monitor_num); scale = gdk_monitor_get_scale_factor (monitor); gdk_monitor_get_geometry (monitor, geometry); -#else - scale = gdk_screen_get_monitor_scale_factor (screen, monitor_num); - gdk_screen_get_monitor_geometry (screen, monitor_num, geometry); -#endif if (scaled && scale != 1) xfwm_geometry_convert_to_device_pixels (geometry, scale); @@ -122,7 +110,6 @@ xfwm_get_primary_monitor_geometry (GdkScreen *screen, gboolean scaled) { gint scale; -#if GTK_CHECK_VERSION(3, 22, 0) GdkDisplay *display; GdkMonitor *monitor; @@ -139,13 +126,6 @@ xfwm_get_primary_monitor_geometry (GdkScreen *screen, scale = gdk_monitor_get_scale_factor (monitor); gdk_monitor_get_geometry (monitor, geometry); -#else - gint monitor_num; - - monitor_num = gdk_screen_get_primary_monitor (screen); - scale = gdk_screen_get_monitor_scale_factor (screen, monitor_num); - gdk_screen_get_monitor_geometry (screen, monitor_num, geometry); -#endif if (scaled && scale != 1) xfwm_geometry_convert_to_device_pixels (geometry, scale); @@ -158,7 +138,6 @@ xfwm_get_primary_monitor_geometry (GdkScreen *screen, gint xfwm_get_primary_refresh_rate (GdkScreen *screen) { -#if GTK_CHECK_VERSION(3, 22, 0) GdkDisplay *display; GdkMonitor *monitor; @@ -166,9 +145,6 @@ xfwm_get_primary_refresh_rate (GdkScreen *screen) monitor = gdk_display_get_primary_monitor (display); return gdk_monitor_get_refresh_rate (monitor) / 1000; -#else - return 60; -#endif } @@ -177,7 +153,6 @@ gboolean xfwm_monitor_is_primary (GdkScreen *screen, gint monitor_num) { -#if GTK_CHECK_VERSION(3, 22, 0) GdkDisplay *display; GdkMonitor *monitor; @@ -185,9 +160,6 @@ xfwm_monitor_is_primary (GdkScreen *screen, monitor = gdk_display_get_monitor (display, monitor_num); return gdk_monitor_is_primary (monitor); -#else - return gdk_screen_get_primary_monitor (screen) == monitor_num; -#endif } @@ -195,11 +167,7 @@ xfwm_monitor_is_primary (GdkScreen *screen, gint xfwm_get_n_monitors (GdkScreen *screen) { -#if GTK_CHECK_VERSION(3, 22, 0) return gdk_display_get_n_monitors (gdk_screen_get_display (screen)); -#else - return gdk_screen_get_n_monitors (screen); -#endif } |