From 08d2a1e2280991796805f34cb76ace948c6b7bbf Mon Sep 17 00:00:00 2001 From: monsta Date: Wed, 20 Jan 2016 14:23:21 +0300 Subject: [GTK+3] fix deprecated usage of GtkMisc --- mate-volume-control/gvc-channel-bar.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'mate-volume-control/gvc-channel-bar.c') diff --git a/mate-volume-control/gvc-channel-bar.c b/mate-volume-control/gvc-channel-bar.c index a9cba92..6a53d03 100644 --- a/mate-volume-control/gvc-channel-bar.c +++ b/mate-volume-control/gvc-channel-bar.c @@ -349,15 +349,33 @@ update_marks (GvcChannelBar *bar) if (has_mark) { gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0); - gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0); - gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0, 0); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (bar->priv->low_image, GTK_ALIGN_CENTER); + gtk_widget_set_valign (bar->priv->low_image, GTK_ALIGN_START); + gtk_widget_set_halign (bar->priv->high_image, GTK_ALIGN_CENTER); + gtk_widget_set_valign (bar->priv->high_image, GTK_ALIGN_START); + gtk_label_set_xalign (GTK_LABEL (bar->priv->label), 0.0); + gtk_label_set_yalign (GTK_LABEL (bar->priv->label), 0.0); +#else + gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.0); + gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.0); + gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.0); +#endif } else { gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0.5, 0, 0); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (bar->priv->low_image, GTK_ALIGN_CENTER); + gtk_widget_set_valign (bar->priv->low_image, GTK_ALIGN_CENTER); + gtk_widget_set_halign (bar->priv->high_image, GTK_ALIGN_CENTER); + gtk_widget_set_valign (bar->priv->high_image, GTK_ALIGN_CENTER); + gtk_label_set_xalign (GTK_LABEL (bar->priv->label), 0.0); + gtk_label_set_yalign (GTK_LABEL (bar->priv->label), 0.5); +#else gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.5); gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.5); - gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5); +#endif } } @@ -1114,7 +1132,12 @@ gvc_channel_bar_init (GvcChannelBar *bar) gtk_widget_set_no_show_all (bar->priv->high_image, TRUE); bar->priv->label = gtk_label_new (NULL); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_label_set_xalign (GTK_LABEL (bar->priv->label), 0.0); + gtk_label_set_yalign (GTK_LABEL (bar->priv->label), 0.5); +#else gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5); +#endif gtk_widget_set_no_show_all (bar->priv->label, TRUE); /* Frame */ -- cgit v1.2.1