diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-04-21 16:40:14 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-04-21 16:40:14 +0000 |
| commit | 03e3fdd79c3c64861fba9cc760c6b3ae1cb97fa3 (patch) | |
| tree | 65b3461fea0558d21a3fb6acf25da0fd944efef5 /ui | |
| parent | 379bc6934cb74c168f6327473799673aec8d8699 (diff) | |
Replace gtk_vbox_new() and gtk_hbox_new() with ws_gtk_box_new().
svn path=/trunk/; revision=42176
Diffstat (limited to 'ui')
69 files changed, 275 insertions, 275 deletions
diff --git a/ui/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c index 926b4b7499..de01ba9a9c 100644 --- a/ui/gtk/ansi_a_stat.c +++ b/ui/gtk/ansi_a_stat.c @@ -289,7 +289,7 @@ ansi_a_stat_gtk_win_create( gtk_window_set_default_size(GTK_WINDOW(dlg_p->win), 480, 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/bootp_stat.c b/ui/gtk/bootp_stat.c index c0e440503e..02bf83dcc2 100644 --- a/ui/gtk/bootp_stat.c +++ b/ui/gtk/bootp_stat.c @@ -222,7 +222,7 @@ dhcpstat_init(const char *optarg, void *userdata _U_) gtk_window_set_destroy_with_parent (GTK_WINDOW(sp->win), TRUE); g_free(title); - vbox = gtk_vbox_new(FALSE, 3); + vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(sp->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c index c8081859b7..d169f9db59 100644 --- a/ui/gtk/camel_counter.c +++ b/ui/gtk/camel_counter.c @@ -176,7 +176,7 @@ static void gtk_camelcounter_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(p_camelcounter->win), 500, 300); - p_camelcounter->vbox=gtk_vbox_new(FALSE, 3); + p_camelcounter->vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(p_camelcounter->vbox), 12); init_main_stat_window(p_camelcounter->win, p_camelcounter->vbox, "CAMEL Messages Counters", filter); diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c index 5d946e1374..2006f11a0e 100644 --- a/ui/gtk/camel_srt.c +++ b/ui/gtk/camel_srt.c @@ -172,7 +172,7 @@ static void gtk_camelsrt_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(p_camelsrt->win), 550, 400); camelsrt_set_title(p_camelsrt); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(p_camelsrt->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index 707ed42ccf..5354248400 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -760,7 +760,7 @@ gtk_comparestat_init(const char *optarg, void* userdata _U_) gtk_window_set_default_size(GTK_WINDOW(cs->win), 550, 400); comparestat_set_title(cs); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(cs->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); @@ -911,14 +911,14 @@ gtk_comparestat_cb(GtkAction *action _U_, gpointer user_data _U_) dlg=dlg_window_new("Wireshark: Compare two capture files"); gtk_window_set_default_size(GTK_WINDOW(dlg), 300, -1); - dlg_box=gtk_vbox_new(FALSE, 10); + dlg_box=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 10, FALSE); gtk_container_set_border_width(GTK_CONTAINER(dlg_box), 10); gtk_container_add(GTK_CONTAINER(dlg), dlg_box); gtk_widget_show(dlg_box); /* spin Box */ - spin_start_box=gtk_hbox_new(FALSE, 10); - spin_stop_box=gtk_hbox_new(FALSE, 10); + spin_start_box=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10, FALSE); + spin_stop_box=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10, FALSE); /* spin label */ gtk_container_set_border_width(GTK_CONTAINER(spin_start_box), 1); @@ -949,7 +949,7 @@ gtk_comparestat_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_widget_show(spin_stop_box); /* differ Box */ - differ_box=gtk_hbox_new(FALSE, 10); + differ_box=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10, FALSE); /* radio label */ gtk_container_set_border_width(GTK_CONTAINER(differ_box), 1); @@ -969,7 +969,7 @@ gtk_comparestat_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_widget_show(differ_box); /* order Box */ - order_box=gtk_hbox_new(FALSE, 10); + order_box=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10, FALSE); /* order label */ gtk_container_set_border_width(GTK_CONTAINER(order_box), 1); @@ -989,7 +989,7 @@ gtk_comparestat_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_widget_show(order_box); /* spin box */ - spin_var_box=gtk_hbox_new(FALSE, 10); + spin_var_box=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10, FALSE); /* spin label */ gtk_container_set_border_width(GTK_CONTAINER(spin_var_box), 1); @@ -1012,7 +1012,7 @@ gtk_comparestat_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_widget_show(spin_var_box); /* filter box */ - filter_box=gtk_hbox_new(FALSE, 3); + filter_box=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); /* filter label */ filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c index 73b2643e7f..504648febe 100644 --- a/ui/gtk/dcerpc_stat.c +++ b/ui/gtk/dcerpc_stat.c @@ -276,7 +276,7 @@ gtk_dcerpcstat_init(const char *optarg, void* userdata _U_) dcerpcstat_set_title(rs); gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400); - vbox = gtk_vbox_new(FALSE, 3); + vbox =ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(rs->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); @@ -553,13 +553,13 @@ void gtk_dcerpcstat_cb(GtkAction *action _U_, gpointer user_data _U_) dlg = dlg_window_new("Wireshark: Compute DCE-RPC SRT statistics"); gtk_window_set_default_size(GTK_WINDOW(dlg), 400, -1); - dlg_box = gtk_vbox_new(FALSE, 10); + dlg_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 10, FALSE); gtk_container_set_border_width(GTK_CONTAINER(dlg_box), 10); gtk_container_add(GTK_CONTAINER(dlg), dlg_box); gtk_widget_show(dlg_box); /* Program box */ - prog_box = gtk_hbox_new(FALSE, 3); + prog_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); /* Program label */ gtk_container_set_border_width(GTK_CONTAINER(prog_box), 10); @@ -663,7 +663,7 @@ void gtk_dcerpcstat_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_widget_show(prog_box); /* Filter box */ - filter_box = gtk_hbox_new(FALSE, 3); + filter_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); /* Filter label */ filter_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c index 2d95745168..03febb3ad4 100644 --- a/ui/gtk/diameter_stat.c +++ b/ui/gtk/diameter_stat.c @@ -168,7 +168,7 @@ gtk_diameterstat_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(diameter->win), 550, 400); diameterstat_set_title(diameter); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(diameter->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c index 9acb8f0bd2..e596fdba80 100644 --- a/ui/gtk/expert_comp_dlg.c +++ b/ui/gtk/expert_comp_dlg.c @@ -800,7 +800,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) error_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); @@ -811,10 +811,10 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) gtk_widget_show_all(ss->win); /* Errors */ - temp_page = gtk_vbox_new(FALSE, 6); + temp_page =ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); ss->error_label = gtk_label_new("Errors: 0/y"); gtk_widget_show(ss->error_label); - hbox = gtk_hbox_new(FALSE, 3); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_error_pb_data); gtk_widget_show(image); @@ -825,10 +825,10 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) init_error_table(&ss->error_table, 0, temp_page); /* Warnings */ - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); ss->warn_label = gtk_label_new("Warnings: 0/y"); gtk_widget_show(ss->warn_label); - hbox = gtk_hbox_new(FALSE, 3); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_warn_pb_data); gtk_widget_show(image); @@ -839,10 +839,10 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) init_error_table(&ss->warn_table, 0, temp_page); /* Notes */ - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); ss->note_label = gtk_label_new("Notes: 0/y"); gtk_widget_show(ss->note_label); - hbox = gtk_hbox_new(FALSE, 3); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_note_pb_data); gtk_widget_show(image); @@ -853,10 +853,10 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) init_error_table(&ss->note_table, 0, temp_page); /* Chat */ - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); ss->chat_label = gtk_label_new("Chats: 0/y"); gtk_widget_show(ss->chat_label); - hbox = gtk_hbox_new(FALSE, 3); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_chat_pb_data); gtk_widget_show(image); @@ -867,15 +867,15 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) init_error_table(&ss->chat_table, 0, temp_page); /* Details */ - details_page = gtk_vbox_new(FALSE, 6); + details_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); ss->all_label = gtk_label_new("Details: 0"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), details_page, ss->all_label); /* Paket comments */ - comments_page = gtk_vbox_new(FALSE, 6); + comments_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); ss->pkt_comments_label = gtk_label_new("Packet Comments: 0/y"); gtk_widget_show(ss->pkt_comments_label); - hbox = gtk_hbox_new(FALSE, 3); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(hbox), ss->pkt_comments_label); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), comments_page, hbox); diff --git a/ui/gtk/export_object.c b/ui/gtk/export_object.c index f320ca091d..164ec60543 100644 --- a/ui/gtk/export_object.c +++ b/ui/gtk/export_object.c @@ -455,7 +455,7 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ gtk_window_set_default_size(GTK_WINDOW(object_list->dlg), DEF_WIDTH, DEF_HEIGHT); - 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(object_list->dlg), vbox); diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c index 05453b57ae..3d0b321943 100644 --- a/ui/gtk/fc_stat.c +++ b/ui/gtk/fc_stat.c @@ -154,7 +154,7 @@ gtk_fcstat_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(fc->win), 550, 400); fcstat_set_title(fc); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(fc->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c index 5e1f7013f9..5390874c17 100644 --- a/ui/gtk/file_import_dlg.c +++ b/ui/gtk/file_import_dlg.c @@ -853,7 +853,7 @@ file_import_dlg_new(void) main_w = dlg_window_new("Wireshark: Import from Text"); gtk_window_set_default_size(GTK_WINDOW(main_w), 400, 300); - 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), 3); gtk_container_add(GTK_CONTAINER(main_w), main_vb); @@ -864,7 +864,7 @@ file_import_dlg_new(void) g_object_set_data(G_OBJECT(main_w), INPUT_FRM_KEY, input_frm); - input_vb = gtk_vbox_new(FALSE, 0); + input_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(input_frm), input_vb); input_tb = gtk_table_new(2, 3, FALSE); @@ -874,7 +874,7 @@ file_import_dlg_new(void) gtk_table_set_col_spacings(GTK_TABLE(input_tb), 5); /* Filename */ - filename_hb = gtk_hbox_new(FALSE, 3); + filename_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(filename_hb), 3); filename_lbl = gtk_label_new("Filename:"); @@ -893,18 +893,18 @@ file_import_dlg_new(void) g_signal_connect(browse_bt, "clicked", G_CALLBACK(browse_file_cb), filename_te); /* Offsets */ - offset_hb = gtk_hbox_new(FALSE, 3); + offset_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(offset_hb), 3); gtk_box_pack_start(GTK_BOX(input_vb), offset_hb, FALSE, FALSE, 0); - offset_lbl_vb = gtk_vbox_new(FALSE, 0); + offset_lbl_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(offset_hb), offset_lbl_vb, FALSE, FALSE, 0); offset_lbl = gtk_label_new("Offsets:"); gtk_misc_set_alignment(GTK_MISC(offset_lbl), 1.0f, 0.0f); gtk_table_attach(GTK_TABLE(input_tb), offset_lbl, 0, 1, 1, 2, 0, 0, 0, 0); - offset_rb_vb = gtk_vbox_new(FALSE, 0); + offset_rb_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_table_attach_defaults(GTK_TABLE(input_tb), offset_rb_vb, 1, 2, 1, 2); /* First entry in the group */ @@ -927,7 +927,7 @@ file_import_dlg_new(void) g_object_set_data(G_OBJECT(input_frm), INPUT_OFFSET_DEC_RB_KEY, offset_dec_rb); /* Time format */ - timefmt_hb = gtk_hbox_new(FALSE, 3); + timefmt_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(timefmt_hb), 3); gtk_box_pack_start(GTK_BOX(input_vb), timefmt_hb, FALSE, FALSE, 0); @@ -959,11 +959,11 @@ file_import_dlg_new(void) g_object_set_data(G_OBJECT(main_w), IMPORT_FRM_KEY, import_frm); - import_vb = gtk_vbox_new(FALSE, 0); + import_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(import_frm), import_vb); /* Encapsulation */ - encap_hb = gtk_hbox_new(FALSE, 3); + encap_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(encap_hb), 3); gtk_box_pack_start(GTK_BOX(import_vb), encap_hb, FALSE, FALSE, 0); @@ -987,15 +987,15 @@ file_import_dlg_new(void) g_object_set_data(G_OBJECT(import_frm), IMPORT_HEADER_FRM_KEY, header_frm); g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_CB_KEY, header_cb); - header_hb = gtk_hbox_new(FALSE, 3); + header_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(header_hb), 3); gtk_container_add(GTK_CONTAINER(header_frm), header_hb); - header_rblbl_vb = gtk_vbox_new(FALSE, 0); + header_rblbl_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(header_hb), header_rblbl_vb, TRUE, TRUE, 0); /* Line 1 */ - header_rblbl_1_hb = gtk_hbox_new(FALSE, 0); + header_rblbl_1_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(header_rblbl_vb), header_rblbl_1_hb, FALSE, FALSE, 2); /* First entry in the group */ @@ -1018,7 +1018,7 @@ file_import_dlg_new(void) g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_ETYPE_TE_KEY, etype_te); /* Line 2 */ - header_rblbl_2_hb = gtk_hbox_new(FALSE, 0); + header_rblbl_2_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(header_rblbl_vb), header_rblbl_2_hb, FALSE, FALSE, 2); header_ipv4_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(header_eth_rb), "IPv4"); @@ -1040,7 +1040,7 @@ file_import_dlg_new(void) g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_PROT_TE_KEY, protocol_te); /* Line 3 */ - header_rblbl_3_hb = gtk_hbox_new(FALSE, 0); + header_rblbl_3_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(header_rblbl_vb), header_rblbl_3_hb, FALSE, FALSE, 2); header_udp_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(header_eth_rb), "UDP"); @@ -1062,7 +1062,7 @@ file_import_dlg_new(void) g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_SRC_PORT_TE_KEY, src_port_te); /* Line 4 */ - header_rblbl_4_hb = gtk_hbox_new(FALSE, 0); + header_rblbl_4_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(header_rblbl_vb), header_rblbl_4_hb, FALSE, FALSE, 2); header_tcp_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(header_eth_rb), "TCP"); @@ -1084,7 +1084,7 @@ file_import_dlg_new(void) g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_DST_PORT_TE_KEY, dst_port_te); /* Line 5 */ - header_rblbl_5_hb = gtk_hbox_new(FALSE, 0); + header_rblbl_5_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(header_rblbl_vb), header_rblbl_5_hb, FALSE, FALSE, 2); header_sctp_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(header_eth_rb), "SCTP"); @@ -1106,7 +1106,7 @@ file_import_dlg_new(void) g_object_set_data(G_OBJECT(header_frm), IMPORT_HEADER_TAG_TE_KEY, tag_te); /* Line 6 */ - header_rblbl_6_hb = gtk_hbox_new(FALSE, 0); + header_rblbl_6_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(header_rblbl_vb), header_rblbl_6_hb, FALSE, FALSE, 2); header_sctp_data_rb = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(header_eth_rb), "SCTP (DATA)"); @@ -1137,7 +1137,7 @@ file_import_dlg_new(void) g_signal_connect(encap_co, "changed", G_CALLBACK(encap_co_changed), header_frm); /* Frame length */ - framelen_hb = gtk_hbox_new(FALSE, 3); + framelen_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(framelen_hb), 3); gtk_box_pack_start(GTK_BOX(import_vb), framelen_hb, FALSE, FALSE, 0); diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c index 50ca8b841b..0f5ba34886 100644 --- a/ui/gtk/fileset_dlg.c +++ b/ui/gtk/fileset_dlg.c @@ -295,7 +295,7 @@ fileset_cb(GtkWidget *w _U_, gpointer d _U_) fs_w = dlg_window_new(""); /* transient_for top_level */ gtk_window_set_destroy_with_parent (GTK_WINDOW(fs_w), TRUE); - 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(fs_w), main_vb); diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c index ddbb82812d..9e4a8600f2 100644 --- a/ui/gtk/filter_dlg.c +++ b/ui/gtk/filter_dlg.c @@ -413,7 +413,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, gtk_window_set_default_size(GTK_WINDOW(main_w), 400, 400); g_object_set_data(G_OBJECT(main_w), E_FILT_CONSTRUCT_ARGS_KEY, construct_args); - 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); @@ -423,13 +423,13 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, filter_te_str = gtk_entry_get_text(GTK_ENTRY(parent_filter_te)); /* Container for each row of widgets */ - filter_vb = gtk_vbox_new(FALSE, 0); + filter_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(filter_vb), 0); gtk_container_add(GTK_CONTAINER(main_vb), filter_vb); gtk_widget_show(filter_vb); /* Top row: Buttons and filter list */ - top_hb = gtk_hbox_new(FALSE, 0); + top_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(filter_vb), top_hb); gtk_widget_show(top_hb); @@ -437,7 +437,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, 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); @@ -502,13 +502,13 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, gtk_box_pack_start(GTK_BOX(filter_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); /* row: Filter name entry */ - middle_hb = gtk_hbox_new(FALSE, 3); + middle_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(props_vb), middle_hb); gtk_widget_show(middle_hb); @@ -523,7 +523,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, gtk_widget_show(name_te); /* row: Filter text entry */ - bottom_hb = gtk_hbox_new(FALSE, 3); + bottom_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(props_vb), bottom_hb); gtk_widget_show(bottom_hb); diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c index 0332bb705e..d3f68937fc 100644 --- a/ui/gtk/filter_expression_save_dlg.c +++ b/ui/gtk/filter_expression_save_dlg.c @@ -244,14 +244,14 @@ filter_expression_save_dlg(gpointer data) filter_save_frame_w = dlg_window_new("Wireshark: Save Filter"); /* Container for each row of widgets */ - main_vb = gtk_vbox_new(FALSE, 3); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(filter_save_frame_w), main_vb); gtk_widget_show(main_vb); /* */ - main_filter_save_hb = gtk_hbox_new(FALSE, 3); + main_filter_save_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(main_vb), main_filter_save_hb); gtk_widget_show(main_filter_save_hb); @@ -261,20 +261,20 @@ filter_expression_save_dlg(gpointer data) TRUE, TRUE, 0); gtk_widget_show(filter_save_frame); - filter_save_type_vb = gtk_vbox_new(FALSE, 3); + filter_save_type_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(filter_save_type_vb), 3); gtk_container_add(GTK_CONTAINER(filter_save_frame), filter_save_type_vb); gtk_widget_show(filter_save_type_vb); /* filter_save type row */ - filter_save_type_hb = gtk_hbox_new(FALSE, 3); + filter_save_type_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(filter_save_type_vb), filter_save_type_hb); gtk_widget_show(filter_save_type_hb); /* filter_save row */ - entry_hb = gtk_hbox_new(FALSE, 3); + entry_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(filter_save_type_vb), entry_hb, FALSE, FALSE, 0); gtk_widget_show(entry_hb); diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c index 7ff98efdd9..e648c890bb 100644 --- a/ui/gtk/find_dlg.c +++ b/ui/gtk/find_dlg.c @@ -147,14 +147,14 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) find_frame_w = dlg_window_new("Wireshark: Find Packet"); /* Container for each row of widgets */ - main_vb = gtk_vbox_new(FALSE, 3); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(find_frame_w), main_vb); gtk_widget_show(main_vb); /* */ - main_find_hb = gtk_hbox_new(FALSE, 3); + main_find_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(main_vb), main_find_hb); gtk_widget_show(main_find_hb); @@ -164,13 +164,13 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_start(GTK_BOX(main_find_hb), find_type_frame, TRUE, TRUE, 0); gtk_widget_show(find_type_frame); - find_type_vb = gtk_vbox_new(FALSE, 3); + find_type_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(find_type_vb), 3); gtk_container_add(GTK_CONTAINER(find_type_frame), find_type_vb); gtk_widget_show(find_type_vb); /* find type row */ - find_type_hb = gtk_hbox_new(FALSE, 3); + find_type_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(find_type_vb), find_type_hb); gtk_widget_show(find_type_hb); @@ -200,7 +200,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_show(string_rb); /* Filter row */ - filter_hb = gtk_hbox_new(FALSE, 3); + filter_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(find_type_vb), filter_hb, FALSE, FALSE, 0); gtk_widget_show(filter_hb); @@ -225,7 +225,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* */ - main_options_hb = gtk_hbox_new(FALSE, 3); + main_options_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(main_vb), main_options_hb); gtk_widget_show(main_options_hb); @@ -236,7 +236,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_show(data_frame); /* search in row */ - data_vb = gtk_vbox_new(TRUE, 0); + data_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(data_vb), 3); gtk_container_add(GTK_CONTAINER(data_frame), data_vb); gtk_widget_show(data_vb); @@ -267,7 +267,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_start(GTK_BOX(main_options_hb), string_opt_frame, TRUE, TRUE, 0); gtk_widget_show(string_opt_frame); - string_opt_vb = gtk_vbox_new(FALSE, 0); + string_opt_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(string_opt_frame), string_opt_vb); gtk_container_set_border_width(GTK_CONTAINER(string_opt_vb), 3); gtk_widget_show(string_opt_vb); @@ -305,7 +305,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_show(direction_frame); /* Direction row: Forward and reverse radio buttons */ - direction_vb = gtk_vbox_new(FALSE, 0); + direction_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(direction_vb), 3); gtk_container_add(GTK_CONTAINER(direction_frame), direction_vb); gtk_widget_show(direction_vb); diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c index 5a270c539f..f0b6a09ed8 100644 --- a/ui/gtk/firewall_dlg.c +++ b/ui/gtk/firewall_dlg.c @@ -220,11 +220,11 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_) gtk_container_set_border_width(GTK_CONTAINER(rule_w), 6); /* setup the container */ - vbox = gtk_vbox_new(FALSE, 6); + vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); gtk_container_add(GTK_CONTAINER(rule_w), vbox); /* rule type selectors hbox */ - hbox = gtk_hbox_new(FALSE, 1); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); /* product selector */ diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c index 8f34b0c259..7af4d5729c 100644 --- a/ui/gtk/flow_graph.c +++ b/ui/gtk/flow_graph.c @@ -484,7 +484,7 @@ flow_graph_dlg_create (void) gtk_window_set_default_size(GTK_WINDOW(flow_graph_dlg_w), 250, 150); - main_vb = gtk_vbox_new (FALSE, 0); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(flow_graph_dlg_w), main_vb); gtk_container_set_border_width (GTK_CONTAINER (main_vb), 7); diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c index 5d97ff0b78..dfec031e83 100644 --- a/ui/gtk/follow_stream.c +++ b/ui/gtk/follow_stream.c @@ -288,13 +288,13 @@ follow_find_cb(GtkWidget * w _U_, gpointer data) NULL); /* Main vertical box */ - main_vb = gtk_vbox_new(FALSE, 3); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(find_dlg_w), main_vb); /* Horizontal box for find label, entry field and up/down radio buttons */ - find_hb = gtk_hbox_new(FALSE, 3); + find_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(main_vb), find_hb); gtk_widget_show(find_hb); @@ -735,7 +735,7 @@ follow_stream(gchar *title, follow_info_t *follow_info, gtk_container_set_border_width(GTK_CONTAINER(streamwindow), 6); /* setup the container */ - vbox = gtk_vbox_new(FALSE, 6); + vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); gtk_container_add(GTK_CONTAINER(streamwindow), vbox); /* content frame */ @@ -747,7 +747,7 @@ follow_stream(gchar *title, follow_info_t *follow_info, gtk_container_add(GTK_CONTAINER(vbox), stream_fr); gtk_widget_show(stream_fr); - stream_vb = gtk_vbox_new(FALSE, 6); + stream_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); gtk_container_set_border_width( GTK_CONTAINER(stream_vb) , 6); gtk_container_add(GTK_CONTAINER(stream_fr), stream_vb); @@ -766,7 +766,7 @@ follow_stream(gchar *title, follow_info_t *follow_info, follow_info->text = text; /* direction hbox */ - direction_hbox = gtk_hbox_new(FALSE, 1); + direction_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE); gtk_box_pack_start(GTK_BOX(stream_vb), direction_hbox, FALSE, FALSE, 0); stream_cmb = gtk_combo_box_text_new(); @@ -792,7 +792,7 @@ follow_stream(gchar *title, follow_info_t *follow_info, gtk_box_pack_start(GTK_BOX(direction_hbox), stream_cmb, TRUE, TRUE, 0); /* stream hbox */ - hbox = gtk_hbox_new(FALSE, 1); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE); gtk_box_pack_start(GTK_BOX(stream_vb), hbox, FALSE, FALSE, 0); /* Create Find Button */ diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index 8e62766570..1795ade23b 100644 --- a/ui/gtk/funnel_stat.c +++ b/ui/gtk/funnel_stat.c @@ -169,7 +169,7 @@ static funnel_text_window_t* new_text_window(const gchar* title) { g_signal_connect(tw->win, "delete-event", G_CALLBACK(text_window_delete_event_cb), tw); txt_scrollw = scrolled_window_new(NULL, NULL); - main_vb = gtk_vbox_new(FALSE, 3); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6); gtk_container_add(GTK_CONTAINER(tw->win), main_vb); @@ -188,7 +188,7 @@ static funnel_text_window_t* new_text_window(const gchar* title) { gtk_text_view_set_left_margin(GTK_TEXT_VIEW(tw->txt), 4); gtk_text_view_set_right_margin(GTK_TEXT_VIEW(tw->txt), 4); - hbox = gtk_hbox_new(FALSE, 0); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_widget_show(hbox); tw->button_hbox = gtk_hbutton_box_new(); @@ -440,7 +440,7 @@ static void funnel_new_dialog(const gchar* title, gtk_window_resize(GTK_WINDOW(win),400,10*(i+2)); - main_vb = gtk_vbox_new(TRUE,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/goto_dlg.c b/ui/gtk/goto_dlg.c index 567f535f7c..eed72f22a9 100644 --- a/ui/gtk/goto_dlg.c +++ b/ui/gtk/goto_dlg.c @@ -56,13 +56,13 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_) goto_frame_w = dlg_window_new("Wireshark: Go To Packet"); /* Container for each row of widgets */ - main_vb = gtk_vbox_new(FALSE, 3); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(goto_frame_w), main_vb); gtk_widget_show(main_vb); /* Frame number row */ - fnumber_hb = gtk_hbox_new(FALSE, 3); + fnumber_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(main_vb), fnumber_hb); gtk_widget_show(fnumber_hb); diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c index 6ded50bbce..a0602a7f1f 100644 --- a/ui/gtk/graph_analysis.c +++ b/ui/gtk/graph_analysis.c @@ -1755,7 +1755,7 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box) GtkRequisition scroll_requisition; GtkWidget *frame; - hbox=gtk_hbox_new(FALSE, 0); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_widget_show(hbox); /* create "time" draw area */ @@ -1878,7 +1878,7 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box) gtk_box_pack_start(GTK_BOX(hbox), user_data->dlg.hpane, TRUE, TRUE, 0); /* Create the scroll_vbox to include the vertical scroll and a box at the bottom */ - scroll_vbox=gtk_vbox_new(FALSE, 0); + scroll_vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_widget_show(scroll_vbox); /* create the associated v_scrollbar */ @@ -1934,7 +1934,7 @@ static void dialog_graph_create_window(graph_analysis_data_t *user_data) user_data->dlg.window=dlg_window_new((user_data->dlg.title)?user_data->dlg.title:win_name); gtk_window_set_destroy_with_parent(GTK_WINDOW(user_data->dlg.window), TRUE); - vbox=gtk_vbox_new(FALSE, 0); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(user_data->dlg.window), vbox); gtk_widget_show(vbox); diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c index e9e503711b..db1d76b985 100644 --- a/ui/gtk/gsm_a_stat.c +++ b/ui/gtk/gsm_a_stat.c @@ -406,7 +406,7 @@ gsm_a_stat_gtk_win_create( gtk_window_set_destroy_with_parent (GTK_WINDOW(dlg_p->win), TRUE); gtk_window_set_default_size(GTK_WINDOW(dlg_p->win), 490, 500); - 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/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c index 5f272fab14..31dc72a8ab 100644 --- a/ui/gtk/gsm_map_stat.c +++ b/ui/gtk/gsm_map_stat.c @@ -398,7 +398,7 @@ gsm_map_stat_gtk_win_create( gtk_window_set_destroy_with_parent (GTK_WINDOW(dlg_p->win), TRUE); gtk_window_set_default_size(GTK_WINDOW(dlg_p->win), 560, 390); - 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/gsm_map_summary.c b/ui/gtk/gsm_map_summary.c index 01c3229a6c..940f4e9fa2 100644 --- a/ui/gtk/gsm_map_summary.c +++ b/ui/gtk/gsm_map_summary.c @@ -97,7 +97,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_window_set_destroy_with_parent (GTK_WINDOW(sum_open_w), TRUE); /* Container for each row of widgets */ - main_vb = gtk_vbox_new(FALSE, 3); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb); gtk_widget_show(main_vb); @@ -107,7 +107,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_container_add(GTK_CONTAINER(main_vb), file_fr); gtk_widget_show(file_fr); - file_box = gtk_vbox_new(FALSE, 3); + file_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(file_fr), file_box); gtk_widget_show(file_box); @@ -134,7 +134,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_container_add(GTK_CONTAINER(main_vb), data_fr); gtk_widget_show(data_fr); - data_box = gtk_vbox_new(FALSE, 3); + data_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(data_fr), data_box); gtk_widget_show(data_box); @@ -179,7 +179,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_container_add(GTK_CONTAINER(main_vb), invoke_fr); gtk_widget_show(invoke_fr); - invoke_box = gtk_vbox_new(FALSE, 3); + invoke_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(invoke_fr), invoke_box); gtk_widget_show(invoke_box); @@ -235,7 +235,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_container_add(GTK_CONTAINER(main_vb), rr_fr); gtk_widget_show(rr_fr); - rr_box = gtk_vbox_new(FALSE, 3); + rr_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(rr_fr), rr_box); gtk_widget_show(rr_box); @@ -291,7 +291,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_container_add(GTK_CONTAINER(main_vb), tot_fr); gtk_widget_show(tot_fr); - tot_box = gtk_vbox_new(FALSE, 3); + tot_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(tot_fr), tot_box); gtk_widget_show(tot_box); diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c index 7eb6b1d37c..357b369b0e 100644 --- a/ui/gtk/gtp_stat.c +++ b/ui/gtk/gtp_stat.c @@ -172,7 +172,7 @@ gtk_gtpstat_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(gtp->win), 550, 400); gtpstat_set_title(gtp); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(gtp->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); diff --git a/ui/gtk/h225_counter.c b/ui/gtk/h225_counter.c index 019db0fe6a..b8651d415a 100644 --- a/ui/gtk/h225_counter.c +++ b/ui/gtk/h225_counter.c @@ -534,7 +534,7 @@ gtk_h225counter_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(hs->win), 400, 200); - hs->vbox=gtk_vbox_new(FALSE, 3); + hs->vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(hs->vbox), 12); init_main_stat_window(hs->win, hs->vbox, "H.225 Message and Message Reason Counter", hs->filter); diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c index 202b3101dc..64c34dee0c 100644 --- a/ui/gtk/h225_ras_srt.c +++ b/ui/gtk/h225_ras_srt.c @@ -301,7 +301,7 @@ gtk_h225rassrt_init(const char *optarg, void *userdata _U_) gtk_window_set_destroy_with_parent (GTK_WINDOW(hs->win), TRUE); gtk_window_set_default_size(GTK_WINDOW(hs->win), 600, 300); - hs->vbox=gtk_vbox_new(FALSE, 3); + hs->vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(hs->vbox), 12); init_main_stat_window(hs->win, hs->vbox, "H.225 RAS Service Response Time", hs->filter); diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index 28ca7f1612..cb8af51a60 100644 --- a/ui/gtk/hostlist_table.c +++ b/ui/gtk/hostlist_table.c @@ -1388,7 +1388,7 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap gtk_window_set_default_size(GTK_WINDOW(hosttable->win), 750, 400); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(hosttable->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); @@ -1507,7 +1507,7 @@ init_hostlist_notebook_page_cb(gboolean hide_ports, const char *table_name, cons hosttable->filter=filter; hosttable->use_dfilter=FALSE; - page_vbox=gtk_vbox_new(FALSE, 6); + page_vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); hosttable->win = page_vbox; gtk_container_set_border_width(GTK_CONTAINER(page_vbox), 6); @@ -1624,7 +1624,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_) gtk_window_set_title(GTK_WINDOW(win), title); gtk_window_set_default_size(GTK_WINDOW(win), 750, 400); - vbox=gtk_vbox_new(FALSE, 6); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); gtk_container_add(GTK_CONTAINER(win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); @@ -1651,7 +1651,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_) pages[0] = GINT_TO_POINTER(page); - hbox = gtk_hbox_new(FALSE, 3); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution"); diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index d14b7c5285..53d04efe60 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -1572,7 +1572,7 @@ static void create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num GtkWidget *label; char str[256]; - hbox=gtk_hbox_new(FALSE, 3); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(box), hbox); gtk_box_set_child_packing(GTK_BOX(box), hbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(hbox); @@ -1615,7 +1615,7 @@ static void create_filter_area(user_data_t* user_data, GtkWidget *box) gtk_container_add(GTK_CONTAINER(box), frame); gtk_widget_show(frame); - vbox=gtk_vbox_new(FALSE, 1); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 1, FALSE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_START); @@ -1754,7 +1754,7 @@ static void create_ctrl_menu(user_data_t* user_data, GtkWidget *box, const char GtkWidget *label; GtkWidget *combo_box; - hbox=gtk_hbox_new(FALSE, 0); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(box), hbox); gtk_box_set_child_packing(GTK_BOX(box), hbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(hbox); @@ -1775,7 +1775,7 @@ static void create_ctrl_area(user_data_t* user_data, GtkWidget *box) GtkWidget *frame; GtkWidget *vbox; - frame_vbox=gtk_vbox_new(FALSE, 0); + frame_vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(box), frame_vbox); gtk_widget_show(frame_vbox); @@ -1783,7 +1783,7 @@ static void create_ctrl_area(user_data_t* user_data, GtkWidget *box) gtk_container_add(GTK_CONTAINER(frame_vbox), frame); gtk_widget_show(frame); - vbox=gtk_vbox_new(FALSE, 0); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_END); @@ -1796,7 +1796,7 @@ static void create_ctrl_area(user_data_t* user_data, GtkWidget *box) gtk_container_add(GTK_CONTAINER(frame_vbox), frame); gtk_widget_show(frame); - vbox=gtk_vbox_new(FALSE, 0); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_END); @@ -1817,13 +1817,13 @@ static void dialog_graph_init_window(user_data_t* user_data) /* create the main window */ user_data->dlg.dialog_graph.window=dlg_window_new("I/O Graphs"); /* transient_for top_level */ - vbox=gtk_vbox_new(FALSE, 0); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(user_data->dlg.dialog_graph.window), vbox); gtk_widget_show(vbox); create_draw_area(user_data, vbox); - hbox=gtk_hbox_new(FALSE, 3); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); gtk_container_set_border_width(GTK_CONTAINER(hbox), 3); gtk_box_set_child_packing(GTK_BOX(vbox), hbox, FALSE, FALSE, 0, GTK_PACK_START); @@ -2196,7 +2196,7 @@ static void save_csv_as_cb(GtkWidget *bt _U_, gpointer data) /* Build our "extra widget" to be added to the file chooser widget */ /* Container for each row of widgets */ - vertb = gtk_vbox_new(FALSE, 0); + vertb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(vertb), 5); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(user_data->dlg.save_csv_as_w), vertb); gtk_widget_show (vertb); @@ -2836,7 +2836,7 @@ static void save_voice_as_cb(GtkWidget *bt _U_, gpointer data) gtk_window_set_transient_for(GTK_WINDOW(user_data->dlg.save_voice_as_w),GTK_WINDOW(user_data->dlg.window)); /* Container for each row of widgets */ - vertb = gtk_vbox_new(FALSE, 0); + vertb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(vertb), 5); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(user_data->dlg.save_voice_as_w), vertb); gtk_widget_show (vertb); @@ -3255,7 +3255,7 @@ static void create_iax2_dialog(user_data_t* user_data) gtk_window_set_default_size(GTK_WINDOW(window), 700, 400); /* Container for each row of widgets */ - main_vb = gtk_vbox_new(FALSE, 2); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 2, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 2); gtk_container_add(GTK_CONTAINER(window), main_vb); gtk_widget_show(main_vb); @@ -3285,7 +3285,7 @@ static void create_iax2_dialog(user_data_t* user_data) g_signal_connect(notebook, "switch_page", G_CALLBACK(on_notebook_switch_page), user_data); /* page for forward connection */ - page = gtk_vbox_new(FALSE, 8); + page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 8, FALSE); gtk_container_set_border_width(GTK_CONTAINER(page), 8); /* direction label */ @@ -3311,7 +3311,7 @@ static void create_iax2_dialog(user_data_t* user_data) gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, label); /* same page for reversed connection */ - page_r = gtk_vbox_new(FALSE, 8); + page_r = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 8, FALSE); gtk_container_set_border_width(GTK_CONTAINER(page_r), 8); label = gtk_label_new(label_reverse); gtk_box_pack_start(GTK_BOX(page_r), label, FALSE, FALSE, 0); @@ -3331,7 +3331,7 @@ static void create_iax2_dialog(user_data_t* user_data) #if 0 /* page for help&about or future */ - page_help = gtk_hbox_new(FALSE, 5); + page_help = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE); label = gtk_label_new(" Future "); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page_help, label); frame = gtk_frame_new(""); diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index a9f50b7f2e..dfeb7f2222 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -1913,7 +1913,7 @@ create_ctrl_menu(io_stat_t *io, GtkWidget *box, const char *name, GtkWidget * (* GtkWidget *label; GtkWidget *combo_box; - hbox=gtk_hbox_new(FALSE, 0); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(box), hbox); gtk_box_set_child_packing(GTK_BOX(box), hbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(hbox); @@ -1945,7 +1945,7 @@ create_ctrl_area(io_stat_t *io, GtkWidget *box) GtkWidget *vbox; GtkWidget *view_cb; - frame_vbox=gtk_vbox_new(FALSE, 0); + frame_vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(box), frame_vbox, FALSE, FALSE, 0); gtk_widget_show(frame_vbox); @@ -1953,7 +1953,7 @@ create_ctrl_area(io_stat_t *io, GtkWidget *box) gtk_container_add(GTK_CONTAINER(frame_vbox), frame); gtk_widget_show(frame); - vbox=gtk_vbox_new(FALSE, 0); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_END); @@ -1972,7 +1972,7 @@ create_ctrl_area(io_stat_t *io, GtkWidget *box) gtk_container_add(GTK_CONTAINER(frame_vbox), frame); gtk_widget_show(frame); - vbox=gtk_vbox_new(FALSE, 0); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_END); @@ -2156,7 +2156,7 @@ create_advanced_menu(io_stat_graph_t *gio, GtkWidget *box, const char *name, Gt GtkWidget *label; GtkWidget *combo_box; - hbox=gtk_hbox_new(FALSE, 0); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(box), hbox); gtk_box_set_child_packing(GTK_BOX(box), hbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(hbox); @@ -2192,7 +2192,7 @@ create_advanced_box(io_stat_graph_t *gio, GtkWidget *box) { GtkWidget *hbox; - hbox=gtk_hbox_new(FALSE, 0); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gio->advanced_buttons=hbox; gtk_container_add(GTK_CONTAINER(box), hbox); gtk_box_set_child_packing(GTK_BOX(box), hbox, TRUE, TRUE, 0, GTK_PACK_START); @@ -2221,7 +2221,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num) char str[256]; int i; - hbox=gtk_hbox_new(FALSE, 3); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(box), hbox); gtk_box_set_child_packing(GTK_BOX(box), hbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(hbox); @@ -2315,7 +2315,7 @@ create_filter_area(io_stat_t *io, GtkWidget *box) gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0); gtk_widget_show(frame); - vbox=gtk_vbox_new(FALSE, 1); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 1, FALSE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_START); @@ -2377,13 +2377,13 @@ init_io_stat_window(io_stat_t *io) io->window = dlg_window_new("I/O Graphs"); gtk_window_set_destroy_with_parent (GTK_WINDOW(io->window), TRUE); - vbox=gtk_vbox_new(FALSE, 0); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(io->window), vbox); gtk_widget_show(vbox); create_draw_area(io, vbox); - hbox=gtk_hbox_new(FALSE, 3); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); gtk_container_set_border_width(GTK_CONTAINER(hbox), 3); gtk_box_set_child_packing(GTK_BOX(vbox), hbox, FALSE, FALSE, 0, GTK_PACK_START); diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c index a31f70a647..8d17238314 100644 --- a/ui/gtk/ldap_stat.c +++ b/ui/gtk/ldap_stat.c @@ -165,7 +165,7 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(ldap->win), 550, 400); ldapstat_set_title(ldap); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(ldap->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c index 881f967f2a..971a489d63 100644 --- a/ui/gtk/mac_lte_stat_dlg.c +++ b/ui/gtk/mac_lte_stat_dlg.c @@ -1048,7 +1048,7 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(hs->mac_lte_stat_dlg_w), 750, 300); /* Will stack widgets vertically inside dlg */ - top_level_vbox = gtk_vbox_new(FALSE, 3); /* FALSE = not homogeneous */ + top_level_vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); /* FALSE = not homogeneous */ gtk_container_add(GTK_CONTAINER(hs->mac_lte_stat_dlg_w), top_level_vbox); gtk_container_set_border_width(GTK_CONTAINER(top_level_vbox), 6); @@ -1061,7 +1061,7 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_) mac_lte_stat_system_lb = gtk_frame_new("System Data"); /* Add max UEs/TTI counts in one row */ - system_row_hbox = gtk_hbox_new(FALSE, 0); + system_row_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(mac_lte_stat_system_lb), system_row_hbox); gtk_container_set_border_width(GTK_CONTAINER(system_row_hbox), 5); @@ -1085,7 +1085,7 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_) mac_lte_stat_common_channel_lb = gtk_frame_new("Common Channel Data"); /* Will add BCH and PCH counters into one row */ - common_row_hbox = gtk_hbox_new(FALSE, 0); + common_row_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(mac_lte_stat_common_channel_lb), common_row_hbox); gtk_container_set_border_width(GTK_CONTAINER(common_row_hbox), 5); @@ -1127,7 +1127,7 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_) /**********************************************/ hs->mac_lte_stat_ues_lb = gtk_frame_new("UL/DL-SCH Data (0 UEs)"); - ues_vb = gtk_vbox_new(FALSE, 0); + ues_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(hs->mac_lte_stat_ues_lb), ues_vb); gtk_container_set_border_width(GTK_CONTAINER(ues_vb), 5); @@ -1192,13 +1192,13 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_) mac_lte_stat_selected_ue_lb = gtk_frame_new("Selected UE details"); - selected_ue_hb = gtk_hbox_new(FALSE, 6); + selected_ue_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6, FALSE); gtk_container_add(GTK_CONTAINER(mac_lte_stat_selected_ue_lb), selected_ue_hb); gtk_container_set_border_width(GTK_CONTAINER(selected_ue_hb), 5); /********************************/ /* First (row titles) column */ - selected_ue_vbox[0] = gtk_vbox_new(FALSE, 0); + selected_ue_vbox[0] = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(selected_ue_hb), selected_ue_vbox[0]); selected_ue_column_titles[0] = gtk_label_new(""); @@ -1216,7 +1216,7 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_) /*************************/ /* Other columns */ for (i=CCCH_COLUMN; i < NUM_CHANNEL_COLUMNS; i++) { - selected_ue_vbox[i] = gtk_vbox_new(FALSE, 0); + selected_ue_vbox[i] = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(selected_ue_hb), selected_ue_vbox[i]); /* Channel title */ @@ -1242,7 +1242,7 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_) mac_lte_stat_filters_lb = gtk_frame_new("Filter on UE"); /* Horizontal row of filter controls */ - filter_buttons_hb = gtk_hbox_new(FALSE, 6); + filter_buttons_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6, FALSE); gtk_container_add(GTK_CONTAINER(mac_lte_stat_filters_lb), filter_buttons_hb); gtk_container_set_border_width(GTK_CONTAINER(filter_buttons_hb), 2); diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index e7d656016f..5ecaca2fff 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -5085,7 +5085,7 @@ menu_prefs_edit_dlg (GtkWidget *w, gpointer data) 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/main_statusbar.c b/ui/gtk/main_statusbar.c index 2949ea0e89..455829c27c 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -299,7 +299,7 @@ statusbar_new(void) GtkWidget *status_hbox; /* Status hbox */ - status_hbox = gtk_hbox_new(FALSE, 1); + status_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE); gtk_container_set_border_width(GTK_CONTAINER(status_hbox), 0); /* info (main) statusbar */ diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c index 264ae7273d..e67dc75616 100644 --- a/ui/gtk/manual_addr_resolv.c +++ b/ui/gtk/manual_addr_resolv.c @@ -123,7 +123,7 @@ manual_addr_resolv_dlg (GtkWidget *w _U_, gpointer data) man_addr_resolv_dlg = dlg_window_new ("Manual Address Resolve"); gtk_window_set_default_size (GTK_WINDOW(man_addr_resolv_dlg), 310, 80); - vbox = gtk_vbox_new (FALSE, 3); + vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(man_addr_resolv_dlg), vbox); gtk_container_set_border_width (GTK_CONTAINER(vbox), 6); diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c index d242e81c8f..cc10e34f2e 100644 --- a/ui/gtk/mcast_stream_dlg.c +++ b/ui/gtk/mcast_stream_dlg.c @@ -288,7 +288,7 @@ mcast_on_params(GtkButton *button _U_, gpointer data _U_) gtk_widget_show(mcast_params_dlg); /* Container for each row of widgets */ - main_vb = gtk_vbox_new(FALSE, 3); + main_vb =ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 2); gtk_container_add(GTK_CONTAINER(mcast_params_dlg), main_vb); gtk_widget_show(main_vb); @@ -658,7 +658,7 @@ mcaststream_dlg_create(void) gtk_window_set_default_size(GTK_WINDOW(mcaststream_dlg_w), 620, 400); - main_vb = gtk_vbox_new (FALSE, 0); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(mcaststream_dlg_w), main_vb); gtk_container_set_border_width (GTK_CONTAINER (main_vb), 12); diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c index d74b480642..9d8a1637f2 100644 --- a/ui/gtk/megaco_stat.c +++ b/ui/gtk/megaco_stat.c @@ -181,7 +181,7 @@ gtk_megacostat_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(ms->win), 550, 150); - ms->vbox=gtk_vbox_new(FALSE, 3); + ms->vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); init_main_stat_window(ms->win, ms->vbox, "MEGACO Service Response Time (SRT) Statistics", ms->filter); diff --git a/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c index e8b370618d..462848e0da 100644 --- a/ui/gtk/mgcp_stat.c +++ b/ui/gtk/mgcp_stat.c @@ -268,7 +268,7 @@ gtk_mgcpstat_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(ms->win), 550, 150); - ms->vbox=gtk_vbox_new(FALSE, 3); + ms->vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); init_main_stat_window(ms->win, ms->vbox, "MGCP Service Response Time (SRT) Statistics", ms->filter); diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c index 9b0d4d298d..aac2ed6ea1 100644 --- a/ui/gtk/mtp3_stat.c +++ b/ui/gtk/mtp3_stat.c @@ -367,7 +367,7 @@ mtp3_stat_gtk_win_create( gtk_window_set_default_size(GTK_WINDOW(dlg_p->win), 640, 390); - 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/mtp3_summary.c b/ui/gtk/mtp3_summary.c index 770d3ccbe8..95cf293f3f 100644 --- a/ui/gtk/mtp3_summary.c +++ b/ui/gtk/mtp3_summary.c @@ -293,7 +293,7 @@ void mtp3_sum_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_window_set_destroy_with_parent (GTK_WINDOW(sum_open_w), TRUE); /* Container for each row of widgets */ - main_vb = gtk_vbox_new(FALSE, 3); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb); gtk_widget_show(main_vb); @@ -303,7 +303,7 @@ void mtp3_sum_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_container_add(GTK_CONTAINER(main_vb), file_fr); gtk_widget_show(file_fr); - file_box = gtk_vbox_new(FALSE, 3); + file_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(file_fr), file_box); gtk_widget_show(file_box); @@ -331,7 +331,7 @@ void mtp3_sum_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_container_add(GTK_CONTAINER(main_vb), data_fr); gtk_widget_show(data_fr); - data_box = gtk_vbox_new(FALSE, 3); + data_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(data_fr), data_box); gtk_widget_show(data_box); @@ -373,7 +373,7 @@ void mtp3_sum_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_container_add(GTK_CONTAINER(main_vb), tot_fr); gtk_widget_show(tot_fr); - tot_box = gtk_vbox_new(FALSE, 3); + tot_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(tot_fr), tot_box); gtk_widget_show(tot_box); diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c index e20a579d87..3d582f2eb0 100644 --- a/ui/gtk/ncp_stat.c +++ b/ui/gtk/ncp_stat.c @@ -522,7 +522,7 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_) ncpstat_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); @@ -537,7 +537,7 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_) main_nb = gtk_notebook_new(); gtk_box_pack_start(GTK_BOX(vbox), main_nb, TRUE, TRUE, 0); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label = gtk_label_new("Groups"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); @@ -549,7 +549,7 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_) init_srt_table(&ss->ncp_srt_table, 256, temp_page, "ncp.group"); /* NCP Functions */ - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label = gtk_label_new("Functions"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("NCP Functions without Subfunctions"); @@ -558,115 +558,115 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_) /* NCP Subfunctions */ - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label = gtk_label_new("17"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 17"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_17_srt_table, 256, temp_page, "ncp.func==17 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("21"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 21"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_21_srt_table, 256, temp_page, "ncp.func==21 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("22"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 22"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_22_srt_table, 256, temp_page, "ncp.func==22 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("23"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 23"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_23_srt_table, 256, temp_page, "ncp.func==23 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("32"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 32"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_32_srt_table, 256, temp_page, "ncp.func==32 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("34"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 34"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_34_srt_table, 256, temp_page, "ncp.func==34 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("35"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 35"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_35_srt_table, 256, temp_page, "ncp.func==35 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page =ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("36"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 36"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_36_srt_table, 256, temp_page, "ncp.func==36 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("86"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 86"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_86_srt_table, 256, temp_page, "ncp.func==86 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("87"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 87"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_87_srt_table, 256, temp_page, "ncp.func==87 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("89"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 89 (Extended NCP's with UTF8 Support)"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_89_srt_table, 256, temp_page, "ncp.func==89 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("90"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 90"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_90_srt_table, 256, temp_page, "ncp.func==90 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("92"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 92 (Secret Store Services)"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_92_srt_table, 256, temp_page, "ncp.func==92 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("94"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 94 (Novell Modular Authentication Services)"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_94_srt_table, 256, temp_page, "ncp.func==94 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("104"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 104"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_104_srt_table, 256, temp_page, "ncp.func==104 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("111"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 111"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_111_srt_table, 256, temp_page, "ncp.func==111 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("114"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 114"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_114_srt_table, 256, temp_page, "ncp.func==114 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("123"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 123"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sub_123_srt_table, 256, temp_page, "ncp.func==123 && ncp.subfunc"); - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("131"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Subfunctions for NCP 131"); @@ -674,21 +674,21 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_) init_srt_table(&ss->sub_131_srt_table, 256, temp_page, "ncp.func==131 && ncp.subfunc"); /* NDS Verbs */ - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("NDS"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("NDS Verbs"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->nds_srt_table, 256, temp_page, "ncp.ndsverb"); /* Secret Store Verbs */ - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("SSS"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("Secret Store Verbs"); gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0); init_srt_table(&ss->sss_srt_table, 256, temp_page, "sss.subverb"); /* NMAS Verbs */ - temp_page = gtk_vbox_new(FALSE, 6); + temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); label=gtk_label_new("NMAS"); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label); label=gtk_label_new("NMAS Verbs"); diff --git a/ui/gtk/new_packet_list.c b/ui/gtk/new_packet_list.c index a5155896f4..394320e01d 100644 --- a/ui/gtk/new_packet_list.c +++ b/ui/gtk/new_packet_list.c @@ -335,7 +335,7 @@ col_details_edit_dlg (gint col_id, GtkTreeViewColumn *col) gtk_window_set_resizable(GTK_WINDOW(win),FALSE); gtk_window_resize(GTK_WINDOW(win), 400, 100); - main_vb = gtk_vbox_new(FALSE, 6); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); gtk_container_add(GTK_CONTAINER(win), main_vb); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6); diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index 9b35d3da17..7d3b20f100 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -612,7 +612,7 @@ not_supported: DataPtr->repr = native_repr; frame = gtk_frame_new("Hex edit"); - frame_vbox = gtk_vbox_new(TRUE, 1); + frame_vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 1, TRUE); /* raw hex edit */ if (finfo->start >= 0 && finfo->length > 0) { @@ -920,7 +920,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean editable _U_) gtk_window_set_default_size(GTK_WINDOW(main_w), DEF_WIDTH, -1); /* Container for paned windows */ - main_vbox = gtk_vbox_new(FALSE, 1); + main_vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 1, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 1); gtk_container_add(GTK_CONTAINER(main_w), main_vbox); gtk_widget_show(main_vbox); diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c index faaf05f43c..d5e549e267 100644 --- a/ui/gtk/pixmap_save.c +++ b/ui/gtk/pixmap_save.c @@ -143,11 +143,11 @@ pixmap_save_cb(GtkWidget *w, gpointer pixmap_ptr _U_) gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(save_as_w), TRUE); /* Container for each row of widgets */ - main_vb = gtk_vbox_new(FALSE, 0); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); file_selection_set_extra_widget(save_as_w, main_vb); gtk_widget_show(main_vb); - save_as_type_hb = gtk_hbox_new(FALSE, 0); + save_as_type_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(main_vb), save_as_type_hb, FALSE, FALSE, 0); gtk_widget_show(save_as_type_hb); diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c index 52dee0b8e8..e300e2f653 100644 --- a/ui/gtk/prefs_capture.c +++ b/ui/gtk/prefs_capture.c @@ -107,7 +107,7 @@ capture_prefs_show(void) const gchar *tooltips_text; /* 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 */ @@ -322,7 +322,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_) ifopts_edit_dlg = dlg_conf_window_new("Wireshark: Preferences: Interface Options"); gtk_window_set_default_size(GTK_WINDOW(ifopts_edit_dlg), 1000, 440); - 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(ifopts_edit_dlg), main_vb); gtk_widget_show(main_vb); @@ -472,7 +472,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_) gtk_box_pack_start(GTK_BOX(main_vb), ed_opts_fr, FALSE, FALSE, 0); gtk_widget_show(ed_opts_fr); - main_hb = gtk_hbox_new(TRUE, 5); + main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, TRUE); gtk_container_set_border_width(GTK_CONTAINER(main_hb), 3); gtk_container_add(GTK_CONTAINER(ed_opts_fr), main_hb); gtk_widget_show(main_hb); diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c index 1e919564c5..0f27b272ba 100644 --- a/ui/gtk/prefs_column.c +++ b/ui/gtk/prefs_column.c @@ -119,11 +119,11 @@ column_prefs_show(GtkWidget *prefs_window) { gint first_row = TRUE; /* 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_widget_show(main_vb); - list_vb = gtk_vbox_new (FALSE, 0); + list_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width (GTK_CONTAINER (list_vb), 5); gtk_widget_show (list_vb); gtk_box_pack_start (GTK_BOX (main_vb), list_vb, TRUE, TRUE, 0); @@ -207,12 +207,12 @@ column_prefs_show(GtkWidget *prefs_window) { g_object_unref(G_OBJECT(store)); /* Bottom row: Add/remove buttons and properties */ - bottom_hb = gtk_hbox_new(FALSE, 5); + bottom_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE); gtk_box_pack_start (GTK_BOX (main_vb), bottom_hb, FALSE, TRUE, 0); gtk_widget_show(bottom_hb); /* Add / remove buttons */ - add_remove_vb = gtk_vbox_new (TRUE, 0); + add_remove_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, TRUE); gtk_container_set_border_width (GTK_CONTAINER (add_remove_vb), 5); gtk_box_pack_start (GTK_BOX (bottom_hb), add_remove_vb, FALSE, FALSE, 0); gtk_widget_show(add_remove_vb); @@ -249,7 +249,7 @@ column_prefs_show(GtkWidget *prefs_window) { gtk_widget_set_tooltip_text(lb, "Select which packet information to present in the column."); gtk_widget_show(lb); - props_hb = gtk_hbox_new(FALSE, 5); + props_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE); gtk_table_attach(GTK_TABLE(tb), props_hb, 1, 2, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0); gtk_widget_set_tooltip_text(props_hb, "Select which packet information to present in the column."); gtk_widget_show(props_hb); diff --git a/ui/gtk/prefs_filter_expressions.c b/ui/gtk/prefs_filter_expressions.c index 8c4487ebba..817d517fac 100644 --- a/ui/gtk/prefs_filter_expressions.c +++ b/ui/gtk/prefs_filter_expressions.c @@ -103,11 +103,11 @@ filter_expressions_prefs_show(void) { "Filter Expression"}; /* 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_widget_show(main_vb); - list_vb = gtk_vbox_new(FALSE, 0); + list_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(list_vb), 5); gtk_widget_show(list_vb); gtk_box_pack_start(GTK_BOX(main_vb), list_vb, TRUE, TRUE, 0); @@ -193,12 +193,12 @@ filter_expressions_prefs_show(void) { g_object_unref(G_OBJECT(store)); /* Bottom row: Add/remove buttons */ - bottom_hb = gtk_hbox_new(FALSE, 5); + bottom_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE); gtk_box_pack_start(GTK_BOX(main_vb), bottom_hb, FALSE, TRUE, 0); gtk_widget_show(bottom_hb); /* Add button */ - add_remove_hb = gtk_hbox_new(TRUE, 0); + add_remove_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, TRUE); gtk_container_set_border_width(GTK_CONTAINER(add_remove_hb), 5); gtk_box_pack_start(GTK_BOX(bottom_hb), add_remove_hb, FALSE, FALSE, 0); gtk_widget_show(add_remove_hb); diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c index 953de9c684..8036507ee9 100644 --- a/ui/gtk/prefs_gui.c +++ b/ui/gtk/prefs_gui.c @@ -193,7 +193,7 @@ gui_prefs_show(void) cfile.cinfo.columns_changed = FALSE; /* 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_layout.c b/ui/gtk/prefs_layout.c index 7ed2320086..58f8792529 100644 --- a/ui/gtk/prefs_layout.c +++ b/ui/gtk/prefs_layout.c @@ -79,7 +79,7 @@ static GtkWidget *layout_content_radio_vbox(GtkWidget *main_vb, int i, layout_pa /* radio vbox */ - radio_vb = gtk_vbox_new(FALSE, 0); + radio_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(radio_vb), 6); g_snprintf (buf, sizeof(buf), "Pane %d:", i); @@ -310,7 +310,7 @@ layout_prefs_show(void) /* 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); /* pane frame */ @@ -319,13 +319,13 @@ layout_prefs_show(void) gtk_widget_show(pane_fr); /* pane vertical box */ - pane_vb = gtk_vbox_new(FALSE, 7); + pane_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 7, FALSE); gtk_container_set_border_width(GTK_CONTAINER(pane_vb), 5); gtk_container_add(GTK_CONTAINER(pane_fr), pane_vb); gtk_widget_show(pane_vb); /* button hbox */ - button_hb = gtk_hbox_new(FALSE, 0); + button_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(button_hb), 6); gtk_box_pack_start (GTK_BOX(pane_vb), button_hb, FALSE, FALSE, 0); @@ -346,7 +346,7 @@ layout_prefs_show(void) g_object_set_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY, layout_type_buttons); /* radio hbox */ - radio_hb = gtk_hbox_new(FALSE, 0); + radio_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(radio_hb), 6); gtk_box_pack_start (GTK_BOX(pane_vb), radio_hb, FALSE, FALSE, 0); @@ -365,7 +365,7 @@ layout_prefs_show(void) gtk_box_pack_start (GTK_BOX(radio_hb), radio_vb, FALSE, FALSE, 0); g_object_set_data(G_OBJECT(main_vb), LAYOUT_CONTENT3_VB_KEY, radio_vb); - default_vb = gtk_vbox_new(FALSE, 0); + default_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); default_bt = gtk_button_new_with_label("Default panes"); gtk_widget_set_tooltip_text (default_bt, "Reset the pane layout settings to default values."); g_signal_connect(default_bt, "clicked", G_CALLBACK(layout_defaults_cb), main_vb); @@ -374,7 +374,7 @@ layout_prefs_show(void) /* Main horizontal box */ /* XXX - Is there a better way to center the table? */ - hbox = gtk_hbox_new(FALSE, 7); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 7, FALSE); gtk_box_pack_start (GTK_BOX(main_vb), hbox, TRUE, FALSE, 0); /* Main table */ diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c index 73f0aae8f3..e7b47f018d 100644 --- a/ui/gtk/radius_stat.c +++ b/ui/gtk/radius_stat.c @@ -337,7 +337,7 @@ gtk_radiusstat_init(const char *optarg, void *userdata _U_) gtk_window_set_destroy_with_parent (GTK_WINDOW(rs->win), TRUE); gtk_window_set_default_size(GTK_WINDOW(rs->win), 600, 150); - rs->vbox=gtk_vbox_new(FALSE, 3); + rs->vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); init_main_stat_window(rs->win, rs->vbox, "RADIUS Service Response Time (SRT) Statistics", rs->filter); diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c index 69b09c4c9f..fd07359afb 100644 --- a/ui/gtk/rlc_lte_stat_dlg.c +++ b/ui/gtk/rlc_lte_stat_dlg.c @@ -1284,7 +1284,7 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(hs->dlg_w), 750, 300); /* Will stack widgets vertically inside dlg */ - top_level_vbox = gtk_vbox_new(FALSE, 3); /* FALSE = not homogeneous */ + top_level_vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); /* FALSE = not homogeneous */ gtk_container_add(GTK_CONTAINER(hs->dlg_w), top_level_vbox); gtk_container_set_border_width(GTK_CONTAINER(top_level_vbox), 6); gtk_widget_show(top_level_vbox); @@ -1312,7 +1312,7 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_) common_channel_lb = gtk_frame_new("Common Channel Data"); /* Will add BCCH and PCCH counters into one row */ - common_row_hbox = gtk_hbox_new(FALSE, 0); + common_row_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(common_channel_lb), common_row_hbox); gtk_container_set_border_width(GTK_CONTAINER(common_row_hbox), 5); gtk_box_pack_start(GTK_BOX(top_level_vbox), common_channel_lb, FALSE, FALSE, 0); @@ -1344,7 +1344,7 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_) /**********************************************/ hs->ues_lb = gtk_frame_new("UE Data (0 UEs)"); - ues_vb = gtk_vbox_new(FALSE, 0); + ues_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(hs->ues_lb), ues_vb); gtk_container_set_border_width(GTK_CONTAINER(ues_vb), 5); @@ -1398,7 +1398,7 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_) /**********************************************/ channels_lb = gtk_frame_new("Channels of selected UE"); - channels_vb = gtk_vbox_new(FALSE, 6); + channels_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); gtk_container_add(GTK_CONTAINER(channels_lb), channels_vb); gtk_container_set_border_width(GTK_CONTAINER(channels_vb), 5); @@ -1454,11 +1454,11 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_) filter_buttons_lb = gtk_frame_new("Filter on selected channel"); - filter_vb = gtk_vbox_new(FALSE, 3); + filter_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(filter_buttons_lb), filter_vb); /* Horizontal row of filter buttons */ - filter_buttons_hb = gtk_hbox_new(FALSE, 6); + filter_buttons_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6, FALSE); gtk_container_add(GTK_CONTAINER(filter_vb), filter_buttons_hb); gtk_container_set_border_width(GTK_CONTAINER(filter_buttons_hb), 2); @@ -1490,7 +1490,7 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_) /* Allow filtering on specific SN number. */ /* Row with label and text entry control */ - sn_filter_hb = gtk_hbox_new(FALSE, 3); + sn_filter_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(filter_vb), sn_filter_hb); gtk_widget_show(sn_filter_hb); diff --git a/ui/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c index 889add594d..b8f35b6cb8 100644 --- a/ui/gtk/rpc_progs.c +++ b/ui/gtk/rpc_progs.c @@ -349,7 +349,7 @@ gtk_rpcprogs_init(const char *optarg _U_, void* userdata _U_) win = dlg_window_new(title_string); /* transient_for top_level */ gtk_window_set_destroy_with_parent (GTK_WINDOW(win), TRUE); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c index 9d5ae80248..5fc19b943d 100644 --- a/ui/gtk/rpc_stat.c +++ b/ui/gtk/rpc_stat.c @@ -262,7 +262,7 @@ gtk_rpcstat_init(const char *optarg, void* userdata _U_) gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400); rpcstat_set_title(rs); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(rs->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); @@ -434,13 +434,13 @@ gtk_rpcstat_cb(GtkAction *action _U_, gpointer user_data _U_) dlg=dlg_window_new("Wireshark: Compute ONC-RPC SRT statistics"); gtk_window_set_default_size(GTK_WINDOW(dlg), 300, -1); - dlg_box=gtk_vbox_new(FALSE, 10); + dlg_box=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 10, FALSE); gtk_container_set_border_width(GTK_CONTAINER(dlg_box), 10); gtk_container_add(GTK_CONTAINER(dlg), dlg_box); gtk_widget_show(dlg_box); /* Program box */ - prog_box=gtk_hbox_new(FALSE, 10); + prog_box=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10, FALSE); /* Program label */ gtk_container_set_border_width(GTK_CONTAINER(prog_box), 10); @@ -473,7 +473,7 @@ gtk_rpcstat_cb(GtkAction *action _U_, gpointer user_data _U_) gtk_widget_show(prog_box); /* Filter box */ - filter_box=gtk_hbox_new(FALSE, 3); + filter_box=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); /* Filter label */ filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 9c4b78705c..741f248150 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -1608,7 +1608,7 @@ static void create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num GtkWidget *label; char str[256]; - hbox=gtk_hbox_new(FALSE, 3); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(box), hbox); gtk_box_set_child_packing(GTK_BOX(box), hbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(hbox); @@ -1652,7 +1652,7 @@ static void create_filter_area(user_data_t* user_data, GtkWidget *box) gtk_container_add(GTK_CONTAINER(box), frame); gtk_widget_show(frame); - vbox=gtk_vbox_new(FALSE, 1); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 1, FALSE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_START); @@ -1794,7 +1794,7 @@ static void create_ctrl_menu(user_data_t* user_data, GtkWidget *box, const char GtkWidget *label; GtkWidget *combo_box; - hbox=gtk_hbox_new(FALSE, 0); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(box), hbox); gtk_box_set_child_packing(GTK_BOX(box), hbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(hbox); @@ -1815,7 +1815,7 @@ static void create_ctrl_area(user_data_t* user_data, GtkWidget *box) GtkWidget *frame; GtkWidget *vbox; - frame_vbox=gtk_vbox_new(FALSE, 0); + frame_vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(box), frame_vbox); gtk_widget_show(frame_vbox); @@ -1823,7 +1823,7 @@ static void create_ctrl_area(user_data_t* user_data, GtkWidget *box) gtk_container_add(GTK_CONTAINER(frame_vbox), frame); gtk_widget_show(frame); - vbox=gtk_vbox_new(FALSE, 0); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_END); @@ -1836,7 +1836,7 @@ static void create_ctrl_area(user_data_t* user_data, GtkWidget *box) gtk_container_add(GTK_CONTAINER(frame_vbox), frame); gtk_widget_show(frame); - vbox=gtk_vbox_new(FALSE, 0); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_END); @@ -1858,13 +1858,13 @@ static void dialog_graph_init_window(user_data_t* user_data) /* create the main window */ user_data->dlg.dialog_graph.window=dlg_window_new("I/O Graphs"); /* transient_for top_level */ - vbox=gtk_vbox_new(FALSE, 0); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(user_data->dlg.dialog_graph.window), vbox); gtk_widget_show(vbox); create_draw_area(user_data, vbox); - hbox=gtk_hbox_new(FALSE, 3); + hbox=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); gtk_container_set_border_width(GTK_CONTAINER(hbox), 3); gtk_box_set_child_packing(GTK_BOX(vbox), hbox, FALSE, FALSE, 0, GTK_PACK_START); @@ -2267,7 +2267,7 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data) gtk_window_set_transient_for(GTK_WINDOW(user_data->dlg.save_csv_as_w),GTK_WINDOW(user_data->dlg.window)); /* Container for each row of widgets */ - vertb = gtk_vbox_new(FALSE, 0); + vertb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(vertb), 5); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(user_data->dlg.save_csv_as_w), vertb); gtk_widget_show (vertb); @@ -2869,7 +2869,7 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data) gtk_window_set_transient_for(GTK_WINDOW(user_data->dlg.save_voice_as_w),GTK_WINDOW(user_data->dlg.window)); /* Container for each row of widgets */ - vertb = gtk_vbox_new(FALSE, 0); + vertb =ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(vertb), 5); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(user_data->dlg.save_voice_as_w), vertb); gtk_widget_show (vertb); @@ -3410,7 +3410,7 @@ static void create_rtp_dialog(user_data_t* user_data) gtk_window_set_default_size(GTK_WINDOW(window), 700, 400); /* Container for each row of widgets */ - main_vb = gtk_vbox_new(FALSE, 2); + main_vb =ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 2, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 2); gtk_container_add(GTK_CONTAINER(window), main_vb); gtk_widget_show(main_vb); @@ -3444,7 +3444,7 @@ static void create_rtp_dialog(user_data_t* user_data) g_signal_connect(notebook, "switch_page", G_CALLBACK(on_notebook_switch_page), user_data); /* page for forward connection */ - page = gtk_vbox_new(FALSE, 8); + page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 8, FALSE); gtk_container_set_border_width(GTK_CONTAINER(page), 8); /* direction label */ @@ -3470,7 +3470,7 @@ static void create_rtp_dialog(user_data_t* user_data) gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, label); /* same page for reversed connection */ - page_r = gtk_vbox_new(FALSE, 8); + page_r = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 8, FALSE); gtk_container_set_border_width(GTK_CONTAINER(page_r), 8); label = gtk_label_new(label_reverse); gtk_box_pack_start(GTK_BOX(page_r), label, FALSE, FALSE, 0); @@ -3490,7 +3490,7 @@ static void create_rtp_dialog(user_data_t* user_data) /* page for help&about or future */ #if 0 - page_help = gtk_hbox_new(FALSE, 5); + page_help = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE); label = gtk_label_new(" Future "); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page_help, label); frame = gtk_frame_new(""); diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c index 4a4a08e246..f684b242b7 100644 --- a/ui/gtk/rtp_player.c +++ b/ui/gtk/rtp_player.c @@ -2337,7 +2337,7 @@ rtp_player_dlg_create(void) gtk_window_set_default_size(GTK_WINDOW(rtp_player_dlg_w), 400, 50); - main_vb = gtk_vbox_new (FALSE, 0); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(rtp_player_dlg_w), main_vb); gtk_container_set_border_width (GTK_CONTAINER (main_vb), 2); @@ -2348,11 +2348,11 @@ rtp_player_dlg_create(void) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (main_scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(main_vb), main_scrolled_window); - channels_vb = gtk_vbox_new (FALSE, 0); + channels_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width (GTK_CONTAINER (channels_vb), 2); gtk_scrolled_window_add_with_viewport((GtkScrolledWindow *) main_scrolled_window, channels_vb); - timestamp_hb = gtk_hbox_new(FALSE, 0); + timestamp_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(main_vb), timestamp_hb, FALSE, FALSE, 0); cb_view_as_time_of_day = gtk_check_button_new_with_label("View as time of day"); gtk_box_pack_start(GTK_BOX(timestamp_hb), cb_view_as_time_of_day, TRUE, FALSE, 0); /* Centered */ @@ -2360,7 +2360,7 @@ rtp_player_dlg_create(void) gtk_widget_set_tooltip_text(cb_view_as_time_of_day, "View the timestamps as time of day instead of seconds since beginning of capture"); g_signal_connect(cb_view_as_time_of_day, "toggled", G_CALLBACK(on_cb_view_as_time_of_day_clicked), NULL); - h_jitter_buttons_box = gtk_hbox_new (FALSE, 0); + h_jitter_buttons_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_container_set_border_width (GTK_CONTAINER (h_jitter_buttons_box), 10); gtk_box_pack_start (GTK_BOX(main_vb), h_jitter_buttons_box, FALSE, FALSE, 0); label = gtk_label_new("Jitter buffer [ms] "); @@ -2421,7 +2421,7 @@ rtp_player_dlg_create(void) /* ?? hbuttonbox = gtk_hbutton_box_new ();*/ /* Filter/status hbox */ - stat_hbox = gtk_hbox_new(FALSE, 1); + stat_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE); gtk_container_set_border_width(GTK_CONTAINER(stat_hbox), 0); /* statusbar */ diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index e3cbc3bcb6..1cabeddb40 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -975,7 +975,7 @@ rtpstream_dlg_create (void) rtpstream_dlg_w = dlg_window_new("Wireshark: RTP Streams"); gtk_window_set_default_size(GTK_WINDOW(rtpstream_dlg_w), 620, 400); - main_vb = gtk_vbox_new (FALSE, 0); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(rtpstream_dlg_w), main_vb); gtk_container_set_border_width (GTK_CONTAINER (main_vb), 12); diff --git a/ui/gtk/scsi_stat.c b/ui/gtk/scsi_stat.c index e8b0caa92c..269e58e506 100644 --- a/ui/gtk/scsi_stat.c +++ b/ui/gtk/scsi_stat.c @@ -230,7 +230,7 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_) gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400); scsistat_set_title(rs); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(rs->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c index eb93e6a771..b5cca831f0 100644 --- a/ui/gtk/sctp_chunk_stat.c +++ b/ui/gtk/sctp_chunk_stat.c @@ -287,7 +287,7 @@ sctpstat_init(const char *optarg, void *userdata _U_) gtk_window_set_destroy_with_parent (GTK_WINDOW(hs->win), TRUE); gtk_window_set_default_size(GTK_WINDOW(hs->win), 700, 250); - hs->vbox=gtk_vbox_new(FALSE, 3); + hs->vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(hs->vbox), 12); init_main_stat_window(hs->win, hs->vbox, "SCTP Chunk Counter", hs->filter); diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c index 64c459e686..f2370e75bc 100644 --- a/ui/gtk/sctp_error_dlg.c +++ b/ui/gtk/sctp_error_dlg.c @@ -231,7 +231,7 @@ gtk_sctperror_dlg(void) g_signal_connect(sctp_error_dlg_w, "destroy", G_CALLBACK(dlg_destroy), NULL); /* Container for each row of widgets */ - vbox1 = gtk_vbox_new(FALSE, 2); + vbox1 = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 2, FALSE); gtk_container_set_border_width(GTK_CONTAINER(vbox1), 8); gtk_container_add(GTK_CONTAINER(sctp_error_dlg_w), vbox1); gtk_widget_show(vbox1); diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c index 202323c771..8b21a411c2 100644 --- a/ui/gtk/sctp_graph_dlg.c +++ b/ui/gtk/sctp_graph_dlg.c @@ -1673,7 +1673,7 @@ init_sctp_graph_window(struct sctp_udata *u_data) u_data->io->window= dlg_window_new("WSCTP 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); diff --git a/ui/gtk/simple_dialog.c b/ui/gtk/simple_dialog.c index c18028f1ad..1fe043ef15 100644 --- a/ui/gtk/simple_dialog.c +++ b/ui/gtk/simple_dialog.c @@ -132,12 +132,12 @@ display_simple_dialog(gint type, gint btn_mask, char *message) gtk_container_set_border_width(GTK_CONTAINER(win), 6); /* Container for our rows */ - main_vb = gtk_vbox_new(FALSE, 12); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 12, FALSE); gtk_container_add(GTK_CONTAINER(win), main_vb); gtk_widget_show(main_vb); /* Top row: Icon and message text */ - top_hb = gtk_hbox_new(FALSE, 12); + top_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6); gtk_container_add(GTK_CONTAINER(main_vb), top_hb); gtk_widget_show(top_hb); @@ -147,7 +147,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message) gtk_widget_show(type_pm); /* column for message and optional check button */ - msg_vb = gtk_vbox_new(FALSE, 6); + msg_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); gtk_box_set_spacing(GTK_BOX(msg_vb), 24); gtk_container_add(GTK_CONTAINER(top_hb), msg_vb); gtk_widget_show(msg_vb); diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c index 306f1ff867..07c27300e2 100644 --- a/ui/gtk/summary_dlg.c +++ b/ui/gtk/summary_dlg.c @@ -217,7 +217,7 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_) sum_open_w = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Summary"); /* Container for each row of widgets */ - main_vb = gtk_vbox_new(FALSE, 12); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 12, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb); @@ -268,7 +268,7 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_) gtk_container_add (GTK_CONTAINER (main_vb), frame); gtk_widget_show (frame); - comment_vbox = gtk_vbox_new (FALSE, 0); + comment_vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add (GTK_CONTAINER (frame), comment_vbox); gtk_widget_show (comment_vbox); diff --git a/ui/gtk/supported_protos_dlg.c b/ui/gtk/supported_protos_dlg.c index 711e9bded6..22c6fafaf9 100644 --- a/ui/gtk/supported_protos_dlg.c +++ b/ui/gtk/supported_protos_dlg.c @@ -96,7 +96,7 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_) gtk_container_set_border_width(GTK_CONTAINER(supported_w), 2); /* Container for each row of 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), 1); gtk_container_add(GTK_CONTAINER(supported_w), main_vb); gtk_widget_show(main_vb); @@ -107,7 +107,7 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_) /* protocol list */ - proto_vb = gtk_vbox_new(FALSE, 0); + proto_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(proto_vb), 1); txt_scrollw = scrolled_window_new(NULL, NULL); @@ -125,7 +125,7 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_) gtk_notebook_append_page(GTK_NOTEBOOK(supported_nb), proto_vb, label); /* display filter fields */ - dfilter_vb = gtk_vbox_new(FALSE, 0); + dfilter_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(dfilter_vb), 1); txt_scrollw = scrolled_window_new(NULL, NULL); diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index 0b9a66ec50..139f1424ac 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -197,7 +197,7 @@ tap_param_dlg_cb(GtkAction *action _U_, gpointer data) gtk_window_set_default_size(GTK_WINDOW(current_dlg->dlg), 300, -1); g_free(title); - dlg_box=gtk_vbox_new(FALSE, 10); + dlg_box=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 10, FALSE); gtk_container_set_border_width(GTK_CONTAINER(dlg_box), 10); gtk_container_add(GTK_CONTAINER(current_dlg->dlg), dlg_box); gtk_widget_show(dlg_box); @@ -205,7 +205,7 @@ tap_param_dlg_cb(GtkAction *action _U_, gpointer data) /* Parameter items */ for(i=0;i<current_dlg->cont.nparams;i++) { /* Item box */ - item_box=gtk_hbox_new(FALSE, 3); + item_box=ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); switch (current_dlg->cont.params[i].type) { diff --git a/ui/gtk/text_page_utils.c b/ui/gtk/text_page_utils.c index 3242244d37..e14777884c 100644 --- a/ui/gtk/text_page_utils.c +++ b/ui/gtk/text_page_utils.c @@ -56,7 +56,7 @@ GtkWidget * text_page_new(const char *absolute_path) { GtkWidget *page_vb, *txt_scrollw, *txt; - page_vb = gtk_vbox_new(FALSE, 0); + page_vb =ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(page_vb), 1); txt_scrollw = scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw), diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c index e4f36fde70..9a91250298 100644 --- a/ui/gtk/time_shift_dlg.c +++ b/ui/gtk/time_shift_dlg.c @@ -126,7 +126,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) time_shift_frame_w = dlg_window_new("Wireshark: Time Shift"); /* Container for each row of widgets */ - main_vb = gtk_vbox_new(FALSE, 3); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(time_shift_frame_w), main_vb); gtk_widget_show(main_vb); @@ -135,7 +135,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) /* * Shift All Packets frame */ - main_hb = gtk_hbox_new(FALSE, 3); + main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(main_vb), main_hb); gtk_widget_show(main_hb); @@ -143,13 +143,13 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_start(GTK_BOX(main_hb), types_frame, TRUE, TRUE, 0); gtk_widget_show(types_frame); - types_vb = gtk_vbox_new(FALSE, 3); + types_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(types_vb), 3); gtk_container_add(GTK_CONTAINER(types_frame), types_vb); gtk_widget_show(types_vb); /* Radio button row */ - timeshift_offset_hb = gtk_hbox_new(FALSE, 3); + timeshift_offset_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(types_vb), timeshift_offset_hb, FALSE, FALSE, 0); gtk_widget_show(timeshift_offset_hb); @@ -159,7 +159,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_set_tooltip_text(timeshift_rb, "Shift the time on the frames."); /* Time Shift entry row */ - timeshift_offset_hb = gtk_hbox_new(FALSE, 3); + timeshift_offset_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(types_vb), timeshift_offset_hb, FALSE, FALSE, 0); gtk_widget_show(timeshift_offset_hb); @@ -178,7 +178,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) /* * Set Packet Number to Time frame */ - main_hb = gtk_hbox_new(FALSE, 3); + main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(main_vb), main_hb); gtk_widget_show(main_hb); @@ -186,13 +186,13 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_start(GTK_BOX(main_hb), types_frame, TRUE, TRUE, 0); gtk_widget_show(types_frame); - types_vb = gtk_vbox_new(FALSE, 3); + types_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(types_vb), 3); gtk_container_add(GTK_CONTAINER(types_frame), types_vb); gtk_widget_show(types_vb); /* time shift type row */ - settime_time_hb = gtk_hbox_new(FALSE, 3); + settime_time_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(types_vb), settime_time_hb, FALSE, FALSE, 0); gtk_widget_show(settime_time_hb); @@ -205,7 +205,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) "Set the time of a certain frame and adjust the rest of the frames " "automatically."); - settime_time_hb = gtk_hbox_new(FALSE, 3); + settime_time_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(types_vb), settime_time_hb, FALSE, FALSE, 0); gtk_widget_show(settime_time_hb); @@ -223,7 +223,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) "The frame which will be set to the time."); /* time shift row */ - settime_time_hb = gtk_hbox_new(FALSE, 3); + settime_time_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(types_vb), settime_time_hb, FALSE, FALSE, 0); gtk_widget_show(settime_time_hb); @@ -243,7 +243,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) /* * Set two Packet Numbers to Time frame and extrapolate */ - main_hb = gtk_hbox_new(FALSE, 3); + main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(main_vb), main_hb); gtk_widget_show(main_hb); @@ -251,13 +251,13 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_start(GTK_BOX(main_hb), types_frame, TRUE, TRUE, 0); gtk_widget_show(types_frame); - types_vb = gtk_vbox_new(FALSE, 3); + types_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(types_vb), 3); gtk_container_add(GTK_CONTAINER(types_frame), types_vb); gtk_widget_show(types_vb); /* packet number row 1 */ - adjtime_offset_hb = gtk_hbox_new(FALSE, 3); + adjtime_offset_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(types_vb), adjtime_offset_hb, FALSE, FALSE, 0); gtk_widget_show(adjtime_offset_hb); @@ -269,7 +269,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) "Set the time of two frames and adjust the rest of the frames " "automatically."); - adjtime_offset_hb = gtk_hbox_new(FALSE, 3); + adjtime_offset_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(types_vb), adjtime_offset_hb, FALSE, FALSE, 0); gtk_widget_show(adjtime_offset_hb); @@ -286,7 +286,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) "The frame which will be set to the time."); /* time shift row */ - adjtime_offset_hb = gtk_hbox_new(FALSE, 3); + adjtime_offset_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(types_vb), adjtime_offset_hb, FALSE, FALSE, 0); gtk_widget_show(adjtime_offset_hb); @@ -305,7 +305,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) "hh:mm:ss[.ddddddddd]"); /* packet number row 2 */ - adjtime_offset_hb = gtk_hbox_new(FALSE, 3); + adjtime_offset_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(types_vb), adjtime_offset_hb, FALSE, FALSE, 0); gtk_widget_show(adjtime_offset_hb); @@ -323,7 +323,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) "The frame which will be set to the time."); /* time shift row */ - adjtime_offset_hb = gtk_hbox_new(FALSE, 3); + adjtime_offset_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(types_vb), adjtime_offset_hb, FALSE, FALSE, 0); gtk_widget_show(adjtime_offset_hb); @@ -344,7 +344,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) /* * Undo all shifts */ - main_hb = gtk_hbox_new(FALSE, 3); + main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(main_vb), main_hb); gtk_widget_show(main_hb); @@ -352,18 +352,18 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_start(GTK_BOX(main_hb), types_frame, TRUE, TRUE, 0); gtk_widget_show(types_frame); - types_vb = gtk_vbox_new(FALSE, 3); + types_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(types_vb), 3); gtk_container_add(GTK_CONTAINER(types_frame), types_vb); gtk_widget_show(types_vb); /* time shift type row */ - undo_type_hb = gtk_hbox_new(FALSE, 3); + undo_type_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(types_vb), undo_type_hb); gtk_widget_show(undo_type_hb); /* time shift row */ - undo_offset_hb = gtk_hbox_new(FALSE, 3); + undo_offset_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(types_vb), undo_offset_hb, FALSE, FALSE, 0); gtk_widget_show(undo_offset_hb); diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index 4329ac2750..0420882294 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -446,7 +446,7 @@ static void uat_edit_dialog(uat_t* uat, gint row, gboolean copy) { gtk_window_set_resizable(GTK_WINDOW(win),FALSE); gtk_window_resize(GTK_WINDOW(win),400, 30*(uat->ncols+2)); - 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); @@ -595,7 +595,7 @@ static void uat_del_dlg(uat_t* uat, int idx) { gtk_window_set_resizable(GTK_WINDOW(win),FALSE); gtk_window_resize(GTK_WINDOW(win),400,25*(uat->ncols+2)); - 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); @@ -868,7 +868,7 @@ static gboolean unsaved_dialog(GtkWindow *w _U_, GdkEvent* e _U_, gpointer u) { gtk_window_set_default_size(GTK_WINDOW(win), 360, 140); gtk_window_set_position(GTK_WINDOW(win), GTK_WIN_POS_CENTER_ON_PARENT); - vbox = gtk_vbox_new(FALSE, 12); + vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 12, FALSE); gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); gtk_container_add(GTK_CONTAINER(win), vbox); @@ -931,15 +931,15 @@ static GtkWidget* uat_window(void* u) { gtk_container_set_border_width(GTK_CONTAINER(rep->window), 6); - rep->vbox = gtk_vbox_new(FALSE, 12); + rep->vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 12, FALSE); gtk_container_set_border_width(GTK_CONTAINER(rep->vbox), 6); gtk_container_add(GTK_CONTAINER(rep->window), rep->vbox); - hbox = gtk_hbox_new(FALSE,12); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12, FALSE); gtk_container_set_border_width(GTK_CONTAINER(hbox), 6); gtk_container_add(GTK_CONTAINER(rep->vbox), hbox); - vbox = gtk_vbox_new(FALSE, 12); + vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 12, FALSE); gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index dc3333c7cc..0e4ed98d5d 100644 --- a/ui/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.c @@ -688,7 +688,7 @@ voip_calls_dlg_create(void) gtk_window_set_default_size(GTK_WINDOW(voip_calls_dlg_w), 1000, 350); - main_vb = gtk_vbox_new(FALSE, 0); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(voip_calls_dlg_w), main_vb); gtk_container_set_border_width(GTK_CONTAINER (main_vb), 12); diff --git a/ui/gtk/wsp_stat.c b/ui/gtk/wsp_stat.c index 620441032f..ab2a4e5906 100644 --- a/ui/gtk/wsp_stat.c +++ b/ui/gtk/wsp_stat.c @@ -362,7 +362,7 @@ gtk_wspstat_init(const char *optarg, void *userdata _U_) g_free(title); /* container for the two frames */ - main_vb = gtk_vbox_new(FALSE, 3); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); gtk_container_add(GTK_CONTAINER(sp->win), main_vb); |