From 99f4ac126c7bd12bc29d9c47fa90bb8b1a37301d Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 8 Jan 2017 20:40:44 +0100 Subject: Fontviewer: do not use deprecated-gtk_misc_set_alignment-and-margin-left-right --- font-viewer/font-view.c | 10 ++++++---- font-viewer/gd-main-toolbar.c | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'font-viewer') diff --git a/font-viewer/font-view.c b/font-viewer/font-view.c index df553476..6e306aa9 100644 --- a/font-viewer/font-view.c +++ b/font-viewer/font-view.c @@ -138,12 +138,14 @@ add_row (GtkWidget *grid, name_w = gtk_label_new (name); gtk_style_context_add_class (gtk_widget_get_style_context (name_w), "dim-label"); - gtk_misc_set_alignment (GTK_MISC (name_w), 1.0, 0.0); + gtk_widget_set_halign (name_w, GTK_ALIGN_END); + gtk_widget_set_valign (name_w, GTK_ALIGN_START); gtk_container_add (GTK_CONTAINER (grid), name_w); label = gtk_label_new (value); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_START); gtk_label_set_selectable (GTK_LABEL(label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); @@ -450,8 +452,8 @@ info_button_clicked_cb (GtkButton *button, gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL); g_object_set (grid, "margin-top", 6, - "margin-left", 16, - "margin-right", 16, + "margin-start", 16, + "margin-end", 16, "margin-bottom", 6, NULL); gtk_grid_set_column_spacing (GTK_GRID (grid), 8); diff --git a/font-viewer/gd-main-toolbar.c b/font-viewer/gd-main-toolbar.c index 9ec8fc0c..843a7851 100644 --- a/font-viewer/gd-main-toolbar.c +++ b/font-viewer/gd-main-toolbar.c @@ -264,7 +264,7 @@ gd_main_toolbar_constructed (GObject *obj) /* left section */ self->priv->left_group = gtk_tool_item_new (); - gtk_widget_set_margin_right (GTK_WIDGET (self->priv->left_group), 12); + gtk_widget_set_margin_end (GTK_WIDGET (self->priv->left_group), 12); gtk_toolbar_insert (tb, self->priv->left_group, -1); gtk_size_group_add_widget (self->priv->vertical_size_group, GTK_WIDGET (self->priv->left_group)); @@ -310,7 +310,7 @@ gd_main_toolbar_constructed (GObject *obj) /* right section */ self->priv->right_group = gtk_tool_item_new (); - gtk_widget_set_margin_left (GTK_WIDGET (self->priv->right_group), 12); + gtk_widget_set_margin_start (GTK_WIDGET (self->priv->right_group), 12); gtk_toolbar_insert (tb, self->priv->right_group, -1); gtk_size_group_add_widget (self->priv->vertical_size_group, GTK_WIDGET (self->priv->right_group)); -- cgit v1.2.1