diff options
author | monsta <[email protected]> | 2018-01-28 22:42:47 +0300 |
---|---|---|
committer | raveit65 <[email protected]> | 2018-01-30 20:11:14 +0100 |
commit | 2be32a55532fbb010f83472064435aae49e36270 (patch) | |
tree | 8a57f8d9d0b17ea7d4277c5d167c6eee4d0164b8 /capplets/appearance | |
parent | 312edc87dae270e11ce2955c7c26b3387ae94985 (diff) | |
download | mate-control-center-2be32a55532fbb010f83472064435aae49e36270.tar.bz2 mate-control-center-2be32a55532fbb010f83472064435aae49e36270.tar.xz |
require GTK+ 3.22 and GLib 2.50
Diffstat (limited to 'capplets/appearance')
-rw-r--r-- | capplets/appearance/appearance-desktop.c | 10 | ||||
-rw-r--r-- | capplets/appearance/appearance-style.c | 4 | ||||
-rw-r--r-- | capplets/appearance/appearance-themes.c | 4 |
3 files changed, 1 insertions, 17 deletions
diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c index ee5d1427..545f6c12 100644 --- a/capplets/appearance/appearance-desktop.c +++ b/capplets/appearance/appearance-desktop.c @@ -883,20 +883,12 @@ static gdouble get_monitor_aspect_ratio_for_widget (GtkWidget *widget) { gdouble aspect; -#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; -#else - gint monitor; -#endif GdkRectangle rect; -#if GTK_CHECK_VERSION (3, 22, 0) monitor = gdk_display_get_monitor_at_window (gtk_widget_get_display (widget), gtk_widget_get_window (widget)); gdk_monitor_get_geometry (monitor, &rect); -#else - monitor = gdk_screen_get_monitor_at_window (gtk_widget_get_screen (widget), gtk_widget_get_window (widget)); - gdk_screen_get_monitor_geometry (gtk_widget_get_screen (widget), monitor, &rect); -#endif + aspect = rect.height / (gdouble)rect.width; return aspect; diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index afd892b6..161917c2 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -234,11 +234,7 @@ static void update_message_area(AppearanceData* data) data->style_message_label = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (data->style_message_label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (data->style_message_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (data->style_message_label), 0.0, 0.5); -#endif hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 9); icon = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG); diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c index 0025e90e..07c41507 100644 --- a/capplets/appearance/appearance-themes.c +++ b/capplets/appearance/appearance-themes.c @@ -661,11 +661,7 @@ theme_message_area_update (AppearanceData *data) data->theme_message_label = gtk_label_new (NULL); gtk_widget_show (data->theme_message_label); gtk_label_set_line_wrap (GTK_LABEL (data->theme_message_label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (data->theme_message_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (data->theme_message_label), 0.0, 0.5); -#endif hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 9); gtk_widget_show (hbox); |