diff options
| author | raveit65 <[email protected]> | 2017-05-03 20:05:54 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2017-05-11 12:49:29 +0200 |
| commit | 522885a3f6648c40eb30e003a994248328859a77 (patch) | |
| tree | 1673f0a4382f798f2519fa4b4ca609a76c187f51 | |
| parent | f9f4cd36f963c1c10137afa4e0c62dbee2470156 (diff) | |
| download | mate-utils-522885a3f6648c40eb30e003a994248328859a77.tar.bz2 mate-utils-522885a3f6648c40eb30e003a994248328859a77.tar.xz | |
searchtool & logview: avoid deprecated GtkAlignment
| -rw-r--r-- | gsearchtool/src/gsearchtool-support.c | 7 | ||||
| -rw-r--r-- | logview/src/logview-findbar.c | 9 |
2 files changed, 6 insertions, 10 deletions
diff --git a/gsearchtool/src/gsearchtool-support.c b/gsearchtool/src/gsearchtool-support.c index b4bdc0b1..5804e378 100644 --- a/gsearchtool/src/gsearchtool-support.c +++ b/gsearchtool/src/gsearchtool-support.c @@ -1120,7 +1120,6 @@ GtkWidget * gsearchtool_button_new_with_stock_icon (const gchar * string, const gchar * stock_id) { - GtkWidget * align; GtkWidget * button; GtkWidget * hbox; GtkWidget * image; @@ -1131,12 +1130,10 @@ gsearchtool_button_new_with_stock_icon (const gchar * string, gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button)); image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_container_add (GTK_CONTAINER (button), align); - gtk_container_add (GTK_CONTAINER (align), hbox); - gtk_widget_show_all (align); + gtk_container_add (GTK_CONTAINER (button), hbox); + gtk_widget_show_all (hbox); return button; } diff --git a/logview/src/logview-findbar.c b/logview/src/logview-findbar.c index bf71a260..58cb9909 100644 --- a/logview/src/logview-findbar.c +++ b/logview/src/logview-findbar.c @@ -164,11 +164,10 @@ logview_findbar_init (LogviewFindbar *findbar) priv->status_bold_id = 0; /* Find: |_______| */ - w = gtk_alignment_new (0.0, 0.5, 1.0, 1.0); - gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 2, 2); - box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); - gtk_container_add (GTK_CONTAINER (w), box); + gtk_widget_set_halign (box, GTK_ALIGN_START); + gtk_widget_set_margin_start (box, 2); + gtk_widget_set_margin_end (box, 2); label = gtk_label_new_with_mnemonic (_("_Find:")); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); @@ -179,7 +178,7 @@ logview_findbar_init (LogviewFindbar *findbar) gtk_box_pack_start (GTK_BOX (box), priv->entry, TRUE, TRUE, 0); item = gtk_tool_item_new (); - gtk_container_add (GTK_CONTAINER (item), w); + gtk_container_add (GTK_CONTAINER (item), box); gtk_toolbar_insert (gtoolbar, item, -1); gtk_widget_show_all (GTK_WIDGET (item)); |