diff options
| author | monsta <[email protected]> | 2016-01-20 11:23:36 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-01-20 12:11:17 +0300 |
| commit | bc0ff5afa554f358ec2b395673bd1a915536eeb1 (patch) | |
| tree | e4fd017b6ed1ecf73049968335eae82345d1fe3c | |
| parent | 4ef8ebf3a36535bd46fe40c7c7a1288f45dcae84 (diff) | |
| download | mate-terminal-bc0ff5afa554f358ec2b395673bd1a915536eeb1.tar.bz2 mate-terminal-bc0ff5afa554f358ec2b395673bd1a915536eeb1.tar.xz | |
[GTK+3] fix deprecated usage of GtkMisc and don't set padding
default value of "margin" property is zero anyway
| -rw-r--r-- | src/terminal-info-bar.c | 5 | ||||
| -rw-r--r-- | src/terminal-tab-label.c | 6 | ||||
| -rw-r--r-- | src/terminal-window.c | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/terminal-info-bar.c b/src/terminal-info-bar.c index 5e60f21..63c91d6 100644 --- a/src/terminal-info-bar.c +++ b/src/terminal-info-bar.c @@ -117,7 +117,12 @@ terminal_info_bar_format_text (TerminalInfoBar *bar, gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_selectable (GTK_LABEL (label), TRUE); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_label_set_yalign (GTK_LABEL (label), 0.0); +#else gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); +#endif gtk_box_pack_start (GTK_BOX (priv->content_box), label, FALSE, FALSE, 0); gtk_widget_show_all (priv->content_box); diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c index 789ba26..84745c3 100644 --- a/src/terminal-tab-label.c +++ b/src/terminal-tab-label.c @@ -136,8 +136,14 @@ terminal_tab_label_constructor (GType type, gtk_box_set_spacing (GTK_BOX (hbox), SPACING); priv->label = label = gtk_label_new (NULL); + +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_label_set_yalign (GTK_LABEL (label), 0.5); +#else gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_padding (GTK_MISC (label), 0, 0); +#endif gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); gtk_label_set_single_line_mode (GTK_LABEL (label), TRUE); diff --git a/src/terminal-window.c b/src/terminal-window.c index 8bcc30a..f380917 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -3915,7 +3915,12 @@ terminal_set_title_callback (GtkAction *action, gtk_box_pack_start (GTK_BOX (message_area), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic (_("_Title:")); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_label_set_yalign (GTK_LABEL (label), 0.5); +#else gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); +#endif gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry = gtk_entry_new (); |