gtk_container_add() -> gtk_box_pack_start().

svn path=/trunk/; revision=43825

9 files changed, 49 insertions, 47 deletions

diff --git a/ui/gtk/bootp_stat.c b/ui/gtk/bootp_stat.c
index ee66b99b15..3f65a7f7d0 100644
--- a/ui/gtk/bootp_stat.c
+++ b/ui/gtk/bootp_stat.c
@@ -228,7 +228,7 @@ dhcpstat_init(const char *optarg, void *userdata _U_)
 
 	/* Status Codes frame */
 	message_type_fr = gtk_frame_new("DHCP Message Type");
-  	gtk_container_add(GTK_CONTAINER(vbox), message_type_fr);
+	gtk_box_pack_start(GTK_BOX (vbox), message_type_fr, FALSE, TRUE, 0);
   	gtk_widget_show(message_type_fr);
 
 	sp->table_message_type = gtk_table_new( 0, 4, FALSE);
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index 8a7ad1c404..5303525246 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -1265,7 +1265,7 @@ capture_remote_cb(GtkWidget *w, gboolean focus_username)
 
   /* Authentication options frame */
   auth_fr = gtk_frame_new("Authentication");
-  gtk_container_add(GTK_CONTAINER(main_vb), auth_fr);
+  gtk_box_pack_start(GTK_BOX (main_vb), auth_fr, FALSE, TRUE, 0);
 
   auth_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(auth_vb), 5);
@@ -1466,7 +1466,7 @@ options_remote_cb(GtkWidget *w _U_, gpointer d _U_)
 
   /* Remote capture options */
   capture_fr = gtk_frame_new("Capture Options");
-  gtk_container_add(GTK_CONTAINER(main_vb), capture_fr);
+  gtk_box_pack_start(GTK_BOX (main_vb), capture_fr, FALSE, TRUE, 0);
 
   capture_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(capture_vb), 5);
@@ -1475,17 +1475,18 @@ options_remote_cb(GtkWidget *w _U_, gpointer d _U_)
   nocap_rpcap_cb = gtk_check_button_new_with_mnemonic("Do not capture own RPCAP traffic");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(nocap_rpcap_cb),
           device.remote_opts.remote_host_opts.nocap_rpcap);
-  gtk_container_add(GTK_CONTAINER(capture_vb), nocap_rpcap_cb);
+  gtk_box_pack_start(GTK_BOX (capture_vb), nocap_rpcap_cb, FALSE, TRUE, 0);
 
   datatx_udp_cb = gtk_check_button_new_with_mnemonic("Use UDP for data transfer");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(datatx_udp_cb),
           device.remote_opts.remote_host_opts.datatx_udp);
-  gtk_container_add(GTK_CONTAINER(capture_vb), datatx_udp_cb);
+  gtk_box_pack_start(GTK_BOX (capture_vb), datatx_udp_cb, FALSE, TRUE, 0);
+
 
 #ifdef HAVE_PCAP_SETSAMPLING
   /* Sampling options */
   sampling_fr = gtk_frame_new("Sampling Options");
-  gtk_container_add(GTK_CONTAINER(main_vb), sampling_fr);
+  gtk_box_pack_start(GTK_BOX (main_vb), sampling_fr, FALSE, TRUE, 0);
 
   sampling_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(sampling_vb), 5);
@@ -1988,7 +1989,7 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
 
   /* Capture-related options frame */
   capture_fr = gtk_frame_new("Capture");
-  gtk_container_add(GTK_CONTAINER(main_vb), capture_fr);
+  gtk_box_pack_start(GTK_BOX (main_vb), capture_fr, FALSE, TRUE, 0);
 
   capture_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(capture_vb), 5);
@@ -3252,7 +3253,7 @@ show_add_interfaces_dialog(void)
   tmp = gtk_label_new("Pipes");
   gtk_widget_show(tmp);
   hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
-  gtk_container_add(GTK_CONTAINER(hbox), tmp);
+  gtk_box_pack_start(GTK_BOX (hbox), tmp, FALSE, TRUE, 0);
 
   gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
 
@@ -3264,12 +3265,12 @@ show_add_interfaces_dialog(void)
   /* Container for each row of widgets */
   pipe_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(pipe_vb), 0);
-  gtk_container_add(GTK_CONTAINER(pipe_hb), pipe_vb);
+  gtk_box_pack_start(GTK_BOX (pipe_hb), pipe_vb, FALSE, TRUE, 0);
   gtk_widget_show(pipe_vb);
 
   /* Top row: Buttons and pipe list */
   top_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
-  gtk_container_add(GTK_CONTAINER(pipe_vb), top_hb);
+  gtk_box_pack_start(GTK_BOX (pipe_vb), top_hb, FALSE, TRUE, 0);
   gtk_widget_show(top_hb);
 
   edit_fr = gtk_frame_new("");
@@ -3339,7 +3340,7 @@ show_add_interfaces_dialog(void)
   gtk_widget_show(props_vb);
 
   middle_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
-  gtk_container_add(GTK_CONTAINER(props_vb), middle_hb);
+  gtk_box_pack_start(GTK_BOX (props_vb), middle_hb, FALSE, TRUE, 0);
   gtk_widget_show(middle_hb);
 
   pipe_lb = gtk_label_new("Pipe:");
@@ -3380,7 +3381,7 @@ show_add_interfaces_dialog(void)
   tmp = gtk_label_new("Local Interfaces");
   gtk_widget_show(tmp);
   hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
-  gtk_container_add(GTK_CONTAINER(hbox), tmp);
+  gtk_box_pack_start(GTK_BOX (hbox), tmp, FALSE, TRUE, 0);
   gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
 
   local_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
@@ -3446,7 +3447,7 @@ show_add_interfaces_dialog(void)
   tmp = gtk_label_new("Remote Interfaces");
   gtk_widget_show(tmp);
   hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
-  gtk_container_add(GTK_CONTAINER(hbox), tmp);
+  gtk_box_pack_start(GTK_BOX (hbox), tmp, FALSE, TRUE, 0);
   gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
 
   remote_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
@@ -3670,7 +3671,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 
   /* Capture-related options frame */
   capture_fr = gtk_frame_new("Capture");
-  gtk_container_add(GTK_CONTAINER(main_vb), capture_fr);
+  gtk_box_pack_start(GTK_BOX (main_vb), capture_fr, FALSE, TRUE, 0);
 
   capture_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(capture_vb), 5);
@@ -3820,7 +3821,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 
   /* Capture file-related options frame */
   file_fr = gtk_frame_new("Capture File(s)");
-  gtk_container_add(GTK_CONTAINER(left_vb), file_fr);
+  gtk_box_pack_start(GTK_BOX (left_vb), file_fr, FALSE, TRUE, 0);
 
   file_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(file_vb), 5);
@@ -3971,7 +3972,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 
   /* Capture limits frame */
   limit_fr = gtk_frame_new("Stop Capture ...");
-  gtk_container_add(GTK_CONTAINER(left_vb), limit_fr);
+  gtk_box_pack_start(GTK_BOX (left_vb), limit_fr, FALSE, TRUE, 0);
 
   limit_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(limit_vb), 5);
@@ -4051,7 +4052,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 
   /* Display-related options frame */
   display_fr = gtk_frame_new("Display Options");
-  gtk_container_add(GTK_CONTAINER(right_vb), display_fr);
+  gtk_box_pack_start(GTK_BOX (right_vb), display_fr, FALSE, TRUE, 0);
 
   display_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(display_vb), 5);
@@ -4066,7 +4067,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_widget_set_tooltip_text(sync_cb,
     "Using this option will show the captured packets immediately on the main screen. "
     "Please note: this will slow down capturing, so increased packet drops might appear.");
-  gtk_container_add(GTK_CONTAINER(display_vb), sync_cb);
+  gtk_box_pack_start(GTK_BOX (display_vb), sync_cb, FALSE, TRUE, 0);
 
   /* "Auto-scroll live update" row */
   auto_scroll_cb = gtk_check_button_new_with_mnemonic("_Automatic scrolling in live capture");
@@ -4074,17 +4075,17 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_widget_set_tooltip_text(auto_scroll_cb,
     "This will scroll the \"Packet List\" automatically to the latest captured packet, "
     "when the \"Update List of packets in real time\" option is used.");
-  gtk_container_add(GTK_CONTAINER(display_vb), auto_scroll_cb);
+  gtk_box_pack_start(GTK_BOX (display_vb), auto_scroll_cb, FALSE, TRUE, 0);
 
   /* "Hide capture info" row */
   hide_info_cb = gtk_check_button_new_with_mnemonic("_Hide capture info dialog");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hide_info_cb), !global_capture_opts.show_info);
   gtk_widget_set_tooltip_text(hide_info_cb, "Hide the capture info dialog while capturing.");
-  gtk_container_add(GTK_CONTAINER(display_vb), hide_info_cb);
+  gtk_box_pack_start(GTK_BOX (display_vb), hide_info_cb, FALSE, TRUE, 0);
 
   /* Name Resolution frame */
   resolv_fr = gtk_frame_new("Name Resolution");
-  gtk_container_add(GTK_CONTAINER(right_vb), resolv_fr);
+  gtk_box_pack_start(GTK_BOX (right_vb), resolv_fr, FALSE, TRUE, 0);
 
   resolv_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(resolv_vb), 5);
@@ -4095,7 +4096,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_resolv_cb),
                 gbl_resolv_flags.mac_name);
   gtk_widget_set_tooltip_text(m_resolv_cb, "Perform MAC layer name resolution while capturing.");
-  gtk_container_add(GTK_CONTAINER(resolv_vb), m_resolv_cb);
+  gtk_box_pack_start(GTK_BOX (resolv_vb), m_resolv_cb, FALSE, TRUE, 0);
 
   t_resolv_cb = gtk_check_button_new_with_mnemonic(
                 "Enable _transport name resolution");
@@ -4103,14 +4104,14 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
                 gbl_resolv_flags.transport_name);
   gtk_widget_set_tooltip_text(t_resolv_cb,
     "Perform transport layer name resolution while capturing.");
-  gtk_container_add(GTK_CONTAINER(resolv_vb), t_resolv_cb);
+  gtk_box_pack_start(GTK_BOX (resolv_vb), t_resolv_cb, FALSE, TRUE, 0);
 
   n_resolv_cb = gtk_check_button_new_with_mnemonic(
                 "Enable _network name resolution");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(n_resolv_cb),
                 gbl_resolv_flags.network_name);
   gtk_widget_set_tooltip_text(n_resolv_cb, "Perform network layer name resolution while capturing.");
-  gtk_container_add(GTK_CONTAINER(resolv_vb), n_resolv_cb);
+  gtk_box_pack_start(GTK_BOX (resolv_vb), n_resolv_cb, FALSE, TRUE, 0);
 
   e_resolv_cb = gtk_check_button_new_with_mnemonic(
                 "Use _external network name resolver");
@@ -4118,7 +4119,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
                 gbl_resolv_flags.use_external_net_name_resolver);
   gtk_widget_set_tooltip_text(e_resolv_cb,
                 "Use the (system's) configured name resolver (e.g., DNS) to resolve network names.");
-  gtk_container_add(GTK_CONTAINER(resolv_vb), e_resolv_cb);
+  gtk_box_pack_start(GTK_BOX (resolv_vb), e_resolv_cb, FALSE, TRUE, 0);
 
   /* Button row: "Start", "Cancel" and "Help" buttons */
   bbox = dlg_button_row_new(WIRESHARK_STOCK_CAPTURE_START, GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
index 41677abaa7..f2e113598b 100644
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@@ -751,7 +751,7 @@ file_merge_cmd(GtkWidget *w)
 
   /* File type row */
   ft_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
-  gtk_container_add(GTK_CONTAINER(main_vb), ft_hb);
+  gtk_box_pack_start(GTK_BOX (main_vb), ft_hb, FALSE, TRUE, 0);
   gtk_widget_show(ft_hb);
 
   ft_lb = gtk_label_new("Merged output file type:");
@@ -1652,7 +1652,7 @@ do_file_save_as(capture_file *cf, gboolean must_support_comments,
 
   /* File type row */
   ft_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
-  gtk_container_add(GTK_CONTAINER(main_vb), ft_hb);
+  gtk_box_pack_start(GTK_BOX (main_vb), ft_hb, FALSE, TRUE, 0);
   gtk_widget_show(ft_hb);
 
   ft_lb = gtk_label_new("File type:");
@@ -1670,7 +1670,7 @@ do_file_save_as(capture_file *cf, gboolean must_support_comments,
   /* compressed - if the file is currently compressed, and the default
      file type supports compression, turn the checkbox on */
   compressed_cb = gtk_check_button_new_with_label("Compress with gzip");
-  gtk_container_add(GTK_CONTAINER(ft_hb), compressed_cb);
+  gtk_box_pack_start(GTK_BOX (ft_hb), compressed_cb, FALSE, TRUE, 0);
   if (cf->iscompressed && wtap_dump_can_compress(default_ft))
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compressed_cb), TRUE);
   gtk_widget_show(compressed_cb);
@@ -1873,7 +1873,8 @@ file_export_specified_packets_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
 
   /* File type row */
   ft_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
-  gtk_container_add(GTK_CONTAINER(main_vb), ft_hb);
+  gtk_box_pack_start(GTK_BOX (main_vb), ft_hb, FALSE, TRUE, 0);
+
   gtk_widget_show(ft_hb);
 
   ft_lb = gtk_label_new("File type:");
@@ -1893,7 +1894,7 @@ file_export_specified_packets_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
 
   /* compressed */
   compressed_cb = gtk_check_button_new_with_label("Compress with gzip");
-  gtk_container_add(GTK_CONTAINER(ft_hb), compressed_cb);
+  gtk_box_pack_start(GTK_BOX (ft_hb), compressed_cb, FALSE, TRUE, 0);
   gtk_widget_show(compressed_cb);
   g_object_set_data(G_OBJECT(file_export_specified_packets_w), E_COMPRESSED_CB_KEY, compressed_cb);
 
@@ -2093,7 +2094,7 @@ file_color_import_cmd_cb(GtkWidget *color_filters, gpointer filter_list _U_)
   gtk_widget_show(main_vb);
 
   cfglobal_but = gtk_button_new_with_label("Global Color Filter File");
-  gtk_container_add(GTK_CONTAINER(main_vb), cfglobal_but);
+  gtk_box_pack_start(GTK_BOX (main_vb), cfglobal_but, FALSE, TRUE, 0);
   g_signal_connect(cfglobal_but, "clicked",
                    G_CALLBACK(color_global_cb), file_color_import_w);
   gtk_widget_show(cfglobal_but);
@@ -2188,7 +2189,7 @@ file_color_export_cmd_cb(GtkWidget *w _U_, gpointer filter_list)
   gtk_widget_show(main_vb);
 
   cfselect_cb = gtk_check_button_new_with_label("Export only selected filters");
-  gtk_container_add(GTK_CONTAINER(main_vb), cfselect_cb);
+  gtk_box_pack_start(GTK_BOX (main_vb), cfselect_cb, FALSE, TRUE, 0);
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cfselect_cb), FALSE);
   g_signal_connect(cfselect_cb, "toggled",
                    G_CALLBACK(color_toggle_selected_cb), NULL);
@@ -2196,7 +2197,7 @@ file_color_export_cmd_cb(GtkWidget *w _U_, gpointer filter_list)
   color_set_export_selected_sensitive(cfselect_cb);
 
   cfglobal_but = gtk_button_new_with_label("Global Color Filter File");
-  gtk_container_add(GTK_CONTAINER(main_vb), cfglobal_but);
+  gtk_box_pack_start(GTK_BOX (main_vb), cfglobal_but, FALSE, TRUE, 0);
   g_signal_connect(cfglobal_but, "clicked",
                    G_CALLBACK(color_global_cb), file_color_export_w);
   gtk_widget_show(cfglobal_but);
diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c
index dcfbffe791..c6054d3946 100644
--- a/ui/gtk/capture_if_details_dlg_win32.c
+++ b/ui/gtk/capture_if_details_dlg_win32.c
@@ -2316,8 +2316,7 @@ capture_if_details_page_new(GtkWidget **table)
     *table = gtk_table_new(1, 2, FALSE);
     gtk_table_set_col_spacings(GTK_TABLE(*table), 6);
     gtk_table_set_row_spacings(GTK_TABLE(*table), 3);
-    gtk_container_add(GTK_CONTAINER(main_vb), *table);
-
+    gtk_box_pack_start(GTK_BOX (main_vb),  *table, FALSE, TRUE, 0);
     return main_vb;
 }
 
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index 89c2c2eab9..49f279a274 100644
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -2785,7 +2785,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
 
     nb = gtk_notebook_new();
-    gtk_container_add(GTK_CONTAINER(vbox), nb);
+    gtk_box_pack_start(GTK_BOX (vbox), nb, FALSE, TRUE, 0);
     g_object_set_data(G_OBJECT(nb), NB_PAGES_KEY, pages);
 
     page = 0;
@@ -2812,14 +2812,14 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
     resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution");
-    gtk_container_add(GTK_CONTAINER(hbox), resolv_cb);
+    gtk_box_pack_start(GTK_BOX (hbox), resolv_cb, FALSE, TRUE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resolv_cb), TRUE);
     gtk_widget_set_tooltip_text(resolv_cb, "Show results of name resolutions rather than the \"raw\" values. "
                                  "Please note: The corresponding name resolution must be enabled.");
     g_signal_connect(resolv_cb, "toggled", G_CALLBACK(ct_resolve_toggle_dest), pages);
 
     filter_cb = gtk_check_button_new_with_mnemonic("Limit to display filter");
-    gtk_container_add(GTK_CONTAINER(hbox), filter_cb);
+    gtk_box_pack_start(GTK_BOX (hbox), filter_cb, FALSE, TRUE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_cb), FALSE);
     gtk_widget_set_tooltip_text(filter_cb, "Limit the list to conversations matching the current display filter.");
     g_signal_connect(filter_cb, "toggled", G_CALLBACK(ct_filter_toggle_dest), pages);
diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c
index 0a18a0551f..3aed21836e 100644
--- a/ui/gtk/decode_as_dlg.c
+++ b/ui/gtk/decode_as_dlg.c
@@ -1848,6 +1848,7 @@ decode_add_notebook (GtkWidget *format_hb)
     /* Start a nootbook for flipping between sets of changes */
     notebook = gtk_notebook_new();
     gtk_container_add(GTK_CONTAINER(format_hb), notebook);
+    gtk_box_pack_start(GTK_BOX (format_hb), notebook, FALSE, TRUE, 0);
     g_object_set_data(G_OBJECT(decode_w), E_NOTEBOOK, notebook);
 
     /* Add link level selection page */
diff --git a/ui/gtk/dfilter_expr_dlg.c b/ui/gtk/dfilter_expr_dlg.c
index 6e0f5c13be..f7e24a59c7 100644
--- a/ui/gtk/dfilter_expr_dlg.c
+++ b/ui/gtk/dfilter_expr_dlg.c
@@ -929,11 +929,11 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
 
     main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
     gtk_container_set_border_width(GTK_CONTAINER(main_hb), 5);
-    gtk_container_add(GTK_CONTAINER(main_vb), main_hb);
+    gtk_box_pack_start(GTK_BOX (main_vb), main_hb, FALSE, TRUE, 0);
 
     field_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
     gtk_container_set_border_width(GTK_CONTAINER(field_vb), 5);
-    gtk_container_add(GTK_CONTAINER(main_hb), field_vb);
+    gtk_box_pack_start(GTK_BOX (main_hb), field_vb, FALSE, TRUE, 0);
 
     field_tree_lb = gtk_label_new("Field name");
     gtk_misc_set_alignment(GTK_MISC(field_tree_lb), 0.0f, 0.0f);
@@ -961,7 +961,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
 
     relation_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
     gtk_container_set_border_width(GTK_CONTAINER(relation_vb), 5);
-    gtk_container_add(GTK_CONTAINER(main_hb), relation_vb);
+    gtk_box_pack_start(GTK_BOX (main_hb), relation_vb, FALSE, TRUE, 0);
 
     relation_label = gtk_label_new("Relation");
     gtk_misc_set_alignment(GTK_MISC(relation_label), 0.0f, 0.0f);
@@ -1036,7 +1036,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
     /* value column */
     value_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
     gtk_container_set_border_width(GTK_CONTAINER(value_vb), 5);
-    gtk_container_add(GTK_CONTAINER(main_hb), value_vb);
+    gtk_box_pack_start(GTK_BOX (main_hb), value_vb, FALSE, TRUE, 0);
 
     value_label = gtk_label_new("Value");
     gtk_misc_set_alignment(GTK_MISC(value_label), 0.0f, 0.0f);
diff --git a/ui/gtk/dissector_tables_dlg.c b/ui/gtk/dissector_tables_dlg.c
index 9c83dfb3b1..36b49b35b4 100644
--- a/ui/gtk/dissector_tables_dlg.c
+++ b/ui/gtk/dissector_tables_dlg.c
@@ -328,7 +328,7 @@ dissector_tables_dlg_init(void)
     tmp = gtk_label_new("String tables");
     gtk_widget_show(tmp);
     hbox =  ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
-    gtk_container_add(GTK_CONTAINER(hbox), tmp);
+    gtk_box_pack_start(GTK_BOX (hbox), tmp, FALSE, TRUE, 0);
     gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
 
     scrolled_window = scrolled_window_new(NULL, NULL);
@@ -343,7 +343,7 @@ dissector_tables_dlg_init(void)
     tmp = gtk_label_new("Integer tables");
     gtk_widget_show(tmp);
     hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
-    gtk_container_add(GTK_CONTAINER(hbox), tmp);
+    gtk_box_pack_start(GTK_BOX (hbox), tmp, FALSE, TRUE, 0);
     gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
 
     scrolled_window = scrolled_window_new(NULL, NULL);
@@ -358,7 +358,7 @@ dissector_tables_dlg_init(void)
     tmp = gtk_label_new("Heuristic tables");
     gtk_widget_show(tmp);
     hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
-    gtk_container_add(GTK_CONTAINER(hbox), tmp);
+    gtk_box_pack_start(GTK_BOX (hbox), tmp, FALSE, TRUE, 0);
     gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
 
     scrolled_window = scrolled_window_new(NULL, NULL);
diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c
index dab361d0a0..816feed601 100644
--- a/ui/gtk/edit_packet_comment_dlg.c
+++ b/ui/gtk/edit_packet_comment_dlg.c
@@ -131,7 +131,7 @@ edit_packet_comment_dlg (GtkAction *action _U_, gpointer data _U_)
     gtk_text_buffer_set_text (buffer, buf_str, -1);
     g_free(buf_str);
   }
-  gtk_container_add(GTK_CONTAINER(vbox), view);
+  gtk_box_pack_start(GTK_BOX (vbox), view, FALSE, TRUE, 0);
   gtk_widget_show (view);
 
   /* Button row. */
@@ -208,7 +208,7 @@ edit_capture_dlg_launch (void)
     gtk_text_buffer_set_text (buffer, buf_str, -1);
     g_free(buf_str);
   }
-  gtk_container_add(GTK_CONTAINER(vbox), view);
+  gtk_box_pack_start(GTK_BOX (vbox), view, FALSE, TRUE, 0);
   gtk_widget_show (view);
 
   /* Button row. */