[balsa/gtk4: 141/284] Various: Stop using GtkBox child properties




commit 12dde1c1fb21b94fd0281012041db4b185f85f2d
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sun Jun 7 14:25:32 2020 -0400

    Various: Stop using GtkBox child properties
    
    Stop using GtkBox padding, fill and expand child properties
    
    * libinit_balsa/assistant_page_defclient.c (balsa_druid_page_defclient_init):
    * libinit_balsa/assistant_page_directory.c (balsa_druid_page_directory_init):
    * libinit_balsa/assistant_page_user.c (balsa_druid_page_user_init):

 ChangeLog                                | 10 ++++++++++
 libinit_balsa/assistant_page_defclient.c |  9 +++------
 libinit_balsa/assistant_page_directory.c |  3 +--
 libinit_balsa/assistant_page_user.c      |  5 ++---
 4 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 06f06bf13..90450cff6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -638,6 +638,16 @@
        * libbalsa/autocrypt.c (autocrypt_db_dialog_run):
        * libbalsa/html.c (libbalsa_html_new):
 
+2020-06-07  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       Various: Stop using GtkBox padding, fill and expand child properties
+
+       * libinit_balsa/assistant_page_defclient.c
+       (balsa_druid_page_defclient_init):
+       * libinit_balsa/assistant_page_directory.c
+       (balsa_druid_page_directory_init):
+       * libinit_balsa/assistant_page_user.c (balsa_druid_page_user_init):
+
 2020-06-07  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Various: Stop using GtkBox padding, fill and expand child properties
diff --git a/libinit_balsa/assistant_page_defclient.c b/libinit_balsa/assistant_page_defclient.c
index 0ee710d71..92c6b2f3c 100644
--- a/libinit_balsa/assistant_page_defclient.c
+++ b/libinit_balsa/assistant_page_defclient.c
@@ -68,22 +68,19 @@ balsa_druid_page_defclient_init(BalsaDruidPageDefclient * defclient,
     gtk_widget_set_vexpand(widget, TRUE);
     gtk_widget_set_valign(widget, GTK_ALIGN_FILL);
     gtk_widget_set_margin_top(widget, 8);
-    gtk_widget_set_margin_bottom(widget, 8);
-    gtk_container_add(GTK_CONTAINER(page), widget);
+    gtk_box_pack_start(GTK_BOX(page), widget, FALSE, FALSE, 0);
 
     widget = GTK_WIDGET(yes);
     gtk_widget_set_vexpand(widget, TRUE);
     gtk_widget_set_valign(widget, GTK_ALIGN_FILL);
     gtk_widget_set_margin_top(widget, 2);
-    gtk_widget_set_margin_bottom(widget, 2);
-    gtk_container_add(GTK_CONTAINER(page), widget);
+    gtk_box_pack_start(GTK_BOX(page), widget, FALSE, FALSE, 0);
 
     widget = GTK_WIDGET(no);
     gtk_widget_set_vexpand(widget, TRUE);
     gtk_widget_set_valign(widget, GTK_ALIGN_FILL);
     gtk_widget_set_margin_top(widget, 2);
-    gtk_widget_set_margin_bottom(widget, 2);
-    gtk_container_add(GTK_CONTAINER(page), widget);
+    gtk_box_pack_start(GTK_BOX(page), widget, FALSE, FALSE, 0);
 
     return;
 }
diff --git a/libinit_balsa/assistant_page_directory.c b/libinit_balsa/assistant_page_directory.c
index c7e148dda..11f737188 100644
--- a/libinit_balsa/assistant_page_directory.c
+++ b/libinit_balsa/assistant_page_directory.c
@@ -301,9 +301,8 @@ balsa_druid_page_directory_init(BalsaDruidPageDirectory * dir,
         g_free(preset);
     }
 
-    gtk_widget_set_vexpand(GTK_WIDGET(grid), TRUE);
     gtk_widget_set_valign(GTK_WIDGET(grid), GTK_ALIGN_FILL);
-    gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(grid));
+    gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(grid), FALSE, FALSE, 0);
     gtk_widget_show_all(GTK_WIDGET(grid));
 
     gtk_container_add(GTK_CONTAINER(page), verify_button(dir));
diff --git a/libinit_balsa/assistant_page_user.c b/libinit_balsa/assistant_page_user.c
index 303b4d1b8..09f7bc3a4 100644
--- a/libinit_balsa/assistant_page_user.c
+++ b/libinit_balsa/assistant_page_user.c
@@ -87,9 +87,8 @@ balsa_druid_page_user_init(BalsaDruidPageUser * user,
     user->ed4.controller = &(user->econtroller);
     label = GTK_LABEL(gtk_label_new(_(header2)));
     gtk_label_set_line_wrap(label, TRUE);
-    gtk_widget_set_vexpand(GTK_WIDGET(label), TRUE);
     gtk_widget_set_valign(GTK_WIDGET(label), GTK_ALIGN_FILL);
-    gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(label));
+    gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(label), FALSE, FALSE, 0);
 
     grid = GTK_GRID(gtk_grid_new());
     gtk_grid_set_row_spacing(grid, 2);
@@ -155,7 +154,7 @@ balsa_druid_page_user_init(BalsaDruidPageUser * user,
 
     gtk_widget_set_margin_top(GTK_WIDGET(grid), 3);
     gtk_widget_set_margin_bottom(GTK_WIDGET(grid), 3);
-    gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(grid));
+    gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(grid), FALSE, FALSE, 0);
 
     user->need_set = FALSE;
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]