Replace gtk_vbox_new() and gtk_hbox_new() with ws_gtk_box_new().

svn path=/trunk/; revision=42178

14 files changed, 33 insertions, 33 deletions

diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c
index 4548b07aa6..1b9fbd5f37 100644
--- a/ui/gtk/afp_stat.c
+++ b/ui/gtk/afp_stat.c
@@ -148,7 +148,7 @@ gtk_afpstat_init(const char *optarg, void *userdata _U_)
 	gtk_window_set_default_size(GTK_WINDOW(ss->win), 550, 600);
 	afpstat_set_title(ss);
 
-	vbox=gtk_vbox_new(FALSE, 3);
+	vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
 	gtk_container_add(GTK_CONTAINER(ss->win), vbox);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
 
diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c
index 3af4ca7d05..3ce1c638eb 100644
--- a/ui/gtk/ansi_map_stat.c
+++ b/ui/gtk/ansi_map_stat.c
@@ -300,7 +300,7 @@ ansi_map_stat_gtk_win_create(
 
     gtk_window_set_default_size(GTK_WINDOW(dlg_p->win), 500, 450);
 
-    vbox = gtk_vbox_new(FALSE, 3);
+    vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
     gtk_container_add(GTK_CONTAINER(dlg_p->win), vbox);
     gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
 
diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c
index 0f5ba34886..e90b4feeaa 100644
--- a/ui/gtk/fileset_dlg.c
+++ b/ui/gtk/fileset_dlg.c
@@ -304,7 +304,7 @@ fileset_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_box_pack_start(GTK_BOX(main_vb), fs_sw, TRUE, TRUE, 0);
 
   /* add a dummy container, so we can replace the table later */
-  fs_tb_vb = gtk_vbox_new(FALSE, 0);
+  fs_tb_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(fs_sw), fs_tb_vb);
 
   fs_dir_lb = gtk_label_new("");
diff --git a/ui/gtk/prefs_nameres.c b/ui/gtk/prefs_nameres.c
index 8869617948..427fd190f7 100644
--- a/ui/gtk/prefs_nameres.c
+++ b/ui/gtk/prefs_nameres.c
@@ -109,7 +109,7 @@ nameres_prefs_show(void)
 	prefs.name_resolve = gbl_resolv_flags;
 
 	/* Main vertical box */
-	main_vb = gtk_vbox_new(FALSE, 7);
+	main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 7, FALSE);
 	gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
 
 	/* Main table */
diff --git a/ui/gtk/prefs_print.c b/ui/gtk/prefs_print.c
index f7efef7229..f9f389b22e 100644
--- a/ui/gtk/prefs_print.c
+++ b/ui/gtk/prefs_print.c
@@ -75,7 +75,7 @@ GtkWidget * printer_prefs_show(void)
 	GtkWidget	*file_lb_hb, *file_lb, *file_bt_hb, *file_bt, *file_te;
 
 	/* Enclosing containers for each row of widgets */
-	main_vb = gtk_vbox_new(FALSE, 5);
+	main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
 	gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
 
 	main_tb = gtk_table_new(4, 2, FALSE);
@@ -103,7 +103,7 @@ GtkWidget * printer_prefs_show(void)
 #endif
 
 
-	file_lb_hb = gtk_hbox_new(FALSE, 0);
+	file_lb_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
 	gtk_table_attach_defaults(GTK_TABLE(main_tb), file_lb_hb, 0, 1, 3, 4);
 	gtk_widget_show(file_lb_hb);
 
@@ -112,7 +112,7 @@ GtkWidget * printer_prefs_show(void)
 	gtk_widget_show(file_lb);
 
 	/* File button and text entry */
-	file_bt_hb = gtk_hbox_new(FALSE, 0);
+	file_bt_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
 	gtk_table_attach_defaults(GTK_TABLE(main_tb), file_bt_hb, 1, 2, 3, 4);
 	gtk_widget_show(file_bt_hb);
 
diff --git a/ui/gtk/prefs_protocols.c b/ui/gtk/prefs_protocols.c
index eeb6fcd770..38ec11c71b 100644
--- a/ui/gtk/prefs_protocols.c
+++ b/ui/gtk/prefs_protocols.c
@@ -44,7 +44,7 @@ protocols_prefs_show(void)
         int pos = 0;
 
         /* Main vertical box */
-        main_vb = gtk_vbox_new(FALSE, 7);
+        main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 7, FALSE);
         gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
 
         /* Main table */
diff --git a/ui/gtk/prefs_stream.c b/ui/gtk/prefs_stream.c
index 7dcd4d3466..f5cb3dff70 100644
--- a/ui/gtk/prefs_stream.c
+++ b/ui/gtk/prefs_stream.c
@@ -97,7 +97,7 @@ stream_prefs_show(void)
   curcolor = &tcolors[CFG_IDX];
 
   /* Enclosing containers for each row of widgets */
-  main_vb = gtk_vbox_new(FALSE, 5);
+  main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
 
   main_tb = gtk_table_new(3, 3, FALSE);
diff --git a/ui/gtk/prefs_taps.c b/ui/gtk/prefs_taps.c
index 321e928301..9cc59dadf6 100644
--- a/ui/gtk/prefs_taps.c
+++ b/ui/gtk/prefs_taps.c
@@ -55,7 +55,7 @@ stats_prefs_show(void)
         int pos = 0;
 
         /* Main vertical box */
-        main_vb = gtk_vbox_new(FALSE, 7);
+        main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 7, FALSE);
         gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
 
         /* Main table */
diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c
index 803cd6a55b..4a7ed9f0b6 100644
--- a/ui/gtk/print_dlg.c
+++ b/ui/gtk/print_dlg.c
@@ -526,7 +526,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
   main_win = dlg_window_new(title);
 
   /* Vertical enclosing container for each row of widgets */
-  main_vb = gtk_vbox_new(FALSE, 5);
+  main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
   gtk_container_add(GTK_CONTAINER(main_win), main_vb);
   gtk_widget_show(main_vb);
@@ -537,7 +537,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
   printer_fr = gtk_frame_new(action == output_action_print ? "Printer" : "Export to file:");
   gtk_box_pack_start(GTK_BOX(main_vb), printer_fr, FALSE, FALSE, 0);
   gtk_widget_show(printer_fr);
-  printer_vb = gtk_vbox_new(FALSE, 5);
+  printer_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(printer_vb), 5);
   gtk_container_add(GTK_CONTAINER(printer_fr), printer_vb);
   gtk_widget_show(printer_vb);
@@ -672,7 +672,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
 /*****************************************************/
 
   /*** hor box for range and format frames ***/
-  packet_hb = gtk_hbox_new(FALSE, 5);
+  packet_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
   gtk_container_add(GTK_CONTAINER(main_vb), packet_hb);
   gtk_widget_show(packet_hb);
 
@@ -694,7 +694,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
         action == output_action_export_text ||
         action == output_action_export_ps)
     gtk_widget_show(format_fr);
-  format_vb = gtk_vbox_new(FALSE, 5);
+  format_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(format_vb), 5);
   gtk_container_add(GTK_CONTAINER(format_fr), format_vb);
   gtk_widget_show(format_vb);
@@ -717,17 +717,17 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
   gtk_widget_show(details_cb);
 
   /*** packet details ***/
-  details_hb = gtk_hbox_new(FALSE, 6);
+  details_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(details_hb), 0);
   gtk_container_add(GTK_CONTAINER(format_vb), details_hb);
   gtk_widget_show(details_hb);
 
-  details_vb = gtk_vbox_new(FALSE, 6);
+  details_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(details_vb), 0);
   gtk_container_add(GTK_CONTAINER(details_hb), details_vb);
   gtk_widget_show(details_vb);
 
-  details_vb = gtk_vbox_new(FALSE, 6);
+  details_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(details_vb), 0);
   gtk_container_add(GTK_CONTAINER(details_hb), details_vb);
   gtk_widget_show(details_vb);
diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c
index 22766e2ab7..a989dcb530 100644
--- a/ui/gtk/profile_dlg.c
+++ b/ui/gtk/profile_dlg.c
@@ -793,19 +793,19 @@ profile_dialog_new(void)
   main_w = dlg_conf_window_new("Wireshark: Configuration Profiles");
   gtk_window_set_default_size(GTK_WINDOW(main_w), 400, 400);
 
-  main_vb = gtk_vbox_new(FALSE, 0);
+  main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
   gtk_container_add(GTK_CONTAINER(main_w), main_vb);
   gtk_widget_show(main_vb);
 
   /* Container for each row of widgets */
-  profile_vb = gtk_vbox_new(FALSE, 0);
+  profile_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(profile_vb), 0);
   gtk_container_add(GTK_CONTAINER(main_vb), profile_vb);
   gtk_widget_show(profile_vb);
 
   /* Top row: Buttons and profile list */
-  top_hb = gtk_hbox_new(FALSE, 0);
+  top_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
   gtk_container_add(GTK_CONTAINER(profile_vb), top_hb);
   gtk_widget_show(top_hb);
 
@@ -813,7 +813,7 @@ profile_dialog_new(void)
   gtk_box_pack_start(GTK_BOX(top_hb), edit_fr, FALSE, FALSE, 0);
   gtk_widget_show(edit_fr);
 
-  list_bb = gtk_vbox_new(TRUE, 0);
+  list_bb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, TRUE);
   gtk_container_set_border_width(GTK_CONTAINER(list_bb), 5);
   gtk_container_add(GTK_CONTAINER(edit_fr), list_bb);
   gtk_widget_show(list_bb);
@@ -885,7 +885,7 @@ profile_dialog_new(void)
   gtk_box_pack_start(GTK_BOX(profile_vb), props_fr, FALSE, FALSE, 0);
   gtk_widget_show(props_fr);
 
-  props_vb = gtk_vbox_new(FALSE, 3);
+  props_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(props_vb), 5);
   gtk_container_add(GTK_CONTAINER(props_fr), props_vb);
   gtk_widget_show(props_vb);
@@ -1217,7 +1217,7 @@ profile_name_edit_dlg (gint operation)
   gtk_window_set_resizable(GTK_WINDOW(win),FALSE);
   gtk_window_resize(GTK_WINDOW(win), 400, 100);
 
-  main_vb = gtk_vbox_new(FALSE, 5);
+  main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
   gtk_container_add(GTK_CONTAINER(win), main_vb);
   gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6);
 
diff --git a/ui/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c
index a7efc59cb8..b2ee888b2c 100644
--- a/ui/gtk/progress_dlg.c
+++ b/ui/gtk/progress_dlg.c
@@ -109,14 +109,14 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title,
     /*
      * Container for dialog widgets.
      */
-    main_vb = gtk_vbox_new(FALSE, 1);
+    main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 1, FALSE);
     gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
     gtk_container_add(GTK_CONTAINER(dlg_w), main_vb);
 
     /*
      * Static labels (left dialog side, labels aligned to the right)
      */
-    static_vb = gtk_vbox_new(FALSE, 1);
+    static_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 1, FALSE);
     task_title_dup = g_strdup_printf ("%s:", task_title);
     tmp_lb = gtk_label_new(task_title_dup);
     gtk_misc_set_alignment(GTK_MISC(tmp_lb), 1.0f, 0.0f);
@@ -138,7 +138,7 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title,
     /*
      * Dynamic labels (right dialog side, labels aligned to the left)
      */
-    dynamic_vb = gtk_vbox_new(FALSE, 1);
+    dynamic_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 1, FALSE);
 
     /*
      * Put the item_title here as a label indicating what we're
@@ -175,7 +175,7 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title,
      * The progress bar (in its own horizontal box, including
      * percentage value)
      */
-    percentage_hb = gtk_hbox_new(FALSE, 1);
+    percentage_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE);
     gtk_box_pack_start(GTK_BOX(dynamic_vb), percentage_hb, FALSE, TRUE, 3);
 
     prog_bar = gtk_progress_bar_new();
@@ -194,7 +194,7 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title,
     /*
      * Static and dynamic boxes are now complete
      */
-    main_hb = gtk_hbox_new(FALSE, 1);
+    main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE);
     gtk_box_pack_start(GTK_BOX(main_hb), static_vb, FALSE, TRUE, 3);
     gtk_box_pack_start(GTK_BOX(main_hb), dynamic_vb, FALSE, TRUE, 3);
     gtk_box_pack_start(GTK_BOX(main_vb), main_hb, FALSE, TRUE, 3);
diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c
index 4745af9f57..4d94ac6161 100644
--- a/ui/gtk/proto_dlg.c
+++ b/ui/gtk/proto_dlg.c
@@ -108,7 +108,7 @@ build_heur_dissectors_treeview(void)
   GtkTreeViewColumn *proto_col;
 
   /* Protocol list */
-  proto_vb = gtk_vbox_new(FALSE, 0);
+  proto_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_widget_show(proto_vb);
 
   proto_sw = scrolled_window_new(NULL, NULL);
@@ -240,7 +240,7 @@ build_protocols_treeview(void)
   GtkTreeViewColumn *proto_col;
 
   /* Protocol list */
-  proto_vb = gtk_vbox_new(FALSE, 0);
+  proto_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
   gtk_widget_show(proto_vb);
 
   proto_sw = scrolled_window_new(NULL, NULL);
@@ -377,7 +377,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_)
 
   /* Container for each row of widgets */
 
-  main_vb = gtk_vbox_new(FALSE, 6);
+  main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE);
   gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6);
   gtk_container_add(GTK_CONTAINER(proto_w), main_vb);
   gtk_widget_show(main_vb);
diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c
index 34c8dfe71b..acf4a3e13c 100644
--- a/ui/gtk/proto_hier_stats_dlg.c
+++ b/ui/gtk/proto_hier_stats_dlg.c
@@ -538,7 +538,7 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
 
     dlg = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Protocol Hierarchy Statistics");
 
-    vbox = gtk_vbox_new(FALSE, 5);
+    vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
     gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
     gtk_container_add(GTK_CONTAINER(dlg), vbox);
 
diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
index b5d21f8f18..19bdcaee56 100644
--- a/ui/gtk/sctp_byte_graph_dlg.c
+++ b/ui/gtk/sctp_byte_graph_dlg.c
@@ -1254,7 +1254,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
 	u_data->io->window = dlg_window_new("SCTP Graphics");  /* transient_for top_level */
 	gtk_window_set_destroy_with_parent (GTK_WINDOW(u_data->io->window), TRUE);
 
-	vbox=gtk_vbox_new(FALSE, 0);
+	vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
 	gtk_container_add(GTK_CONTAINER(u_data->io->window), vbox);
 	gtk_widget_show(vbox);