From 42310b6eb966e013ef209c7faa266fadbac5fa01 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Fri, 20 Apr 2012 15:28:00 +0000 Subject: Replace gtk_vbox_new() and gtk_hbox_new() with ws_gtk_box_new(). svn path=/trunk/; revision=42162 --- ui/gtk/capture_if_details_dlg_win32.c | 6 +++--- ui/gtk/sctp_assoc_analyse.c | 32 ++++++++++++++++---------------- ui/gtk/sctp_chunk_stat_dlg.c | 4 ++-- ui/gtk/sctp_stat_dlg.c | 2 +- ui/gtk/sip_stat.c | 4 ++-- ui/gtk/smb2_stat.c | 2 +- ui/gtk/smb_stat.c | 2 +- ui/gtk/stats_tree_stat.c | 2 +- ui/gtk/tcp_graph.c | 28 ++++++++++++++-------------- ui/gtk/wlan_stat_dlg.c | 8 ++++---- 10 files changed, 45 insertions(+), 45 deletions(-) (limited to 'ui') diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c index a8b3562f26..9606f58b79 100644 --- a/ui/gtk/capture_if_details_dlg_win32.c +++ b/ui/gtk/capture_if_details_dlg_win32.c @@ -873,7 +873,7 @@ add_meter_to_table(GtkWidget *list, guint *row, gchar *title, gtk_table_attach(GTK_TABLE(list), label, 0, 1, *row, *row+1, GTK_EXPAND|GTK_FILL, 0, 0,0); /* the level meter */ - main_hb = gtk_hbox_new(FALSE, 6); + main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6, FALSE); meter = gtk_vumeter_new (); @@ -2309,7 +2309,7 @@ capture_if_details_page_new(GtkWidget **table) { GtkWidget *main_vb; - main_vb = gtk_vbox_new(FALSE, 6); + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12); /* table */ @@ -2356,7 +2356,7 @@ capture_if_details_open_win(char *iface) gtk_window_set_destroy_with_parent (GTK_WINDOW(details_open_w), TRUE); /* Container for the window contents */ - 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(details_open_w), main_vb); diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index 8aa8334ceb..37e5109914 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -516,7 +516,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) g_signal_connect(window, "destroy", G_CALLBACK(on_destroy), u_data); /* 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); @@ -527,7 +527,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) g_object_set_data(G_OBJECT(window), "notebook", notebook); g_signal_connect(notebook, "switch_page", G_CALLBACK(on_notebook_switch_page), NULL); - page1 = gtk_vbox_new(FALSE, 8); + page1 = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL,8, FALSE); gtk_container_set_border_width(GTK_CONTAINER(page1), 8); u_data->analyse_nb->checktype = gtk_label_new(""); @@ -597,7 +597,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) /* page for endpoint 1 */ - page2 = gtk_vbox_new(FALSE, 8); + page2 = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 8, FALSE); gtk_container_set_border_width(GTK_CONTAINER(page2), 8); u_data->analyse_nb->page2 = g_malloc(sizeof(struct page)); @@ -605,7 +605,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) u_data->analyse_nb->page2->addr_frame = gtk_frame_new(NULL); gtk_container_add(GTK_CONTAINER(page2), u_data->analyse_nb->page2->addr_frame); - addr_hb = gtk_hbox_new(FALSE, 3); + addr_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(addr_hb), 5); gtk_container_add(GTK_CONTAINER(u_data->analyse_nb->page2->addr_frame), addr_hb); @@ -623,23 +623,23 @@ static void create_analyse_window(struct sctp_analyse* u_data) stat_fr = gtk_frame_new(NULL); gtk_container_add(GTK_CONTAINER(page2), stat_fr); - hbox = gtk_hbox_new(FALSE,3); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); gtk_container_add(GTK_CONTAINER(stat_fr), hbox); - vbox_l = gtk_vbox_new(FALSE, 3); + vbox_l = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(hbox), vbox_l, TRUE, TRUE, 0); - hbox_l1 = gtk_hbox_new(FALSE,3); + hbox_l1 = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(vbox_l), hbox_l1, TRUE, TRUE, 0); u_data->analyse_nb->page2->port = gtk_label_new(""); gtk_box_pack_start(GTK_BOX(hbox_l1), u_data->analyse_nb->page2->port, TRUE, TRUE, 0); gtk_misc_set_alignment (GTK_MISC(u_data->analyse_nb->page2->port),0,0); - hbox_l2 = gtk_hbox_new(FALSE,3); + hbox_l2 = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(vbox_l), hbox_l2, TRUE, TRUE, 0); @@ -649,7 +649,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) gtk_misc_set_alignment (GTK_MISC(u_data->analyse_nb->page2->veritag),0,0); gtk_widget_show(vbox_l); - vbox_r = gtk_vbox_new(FALSE, 3); + vbox_r = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(hbox), vbox_r, TRUE, TRUE, 0); u_data->analyse_nb->page2->max_in = gtk_label_new(""); @@ -705,14 +705,14 @@ static void create_analyse_window(struct sctp_analyse* u_data) /* same page for endpoint 2*/ - page3 = gtk_vbox_new(FALSE, 8); + page3 = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 8, FALSE); gtk_container_set_border_width(GTK_CONTAINER(page3), 8); u_data->analyse_nb->page3 = g_malloc(sizeof(struct page)); u_data->analyse_nb->page3->addr_frame = gtk_frame_new(NULL); gtk_container_add(GTK_CONTAINER(page3), u_data->analyse_nb->page3->addr_frame); - addr_hb = gtk_hbox_new(FALSE, 3); + addr_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(addr_hb), 5); gtk_container_add(GTK_CONTAINER(u_data->analyse_nb->page3->addr_frame), addr_hb); @@ -731,21 +731,21 @@ static void create_analyse_window(struct sctp_analyse* u_data) stat_fr = gtk_frame_new(NULL); gtk_container_add(GTK_CONTAINER(page3), stat_fr); - hbox = gtk_hbox_new(FALSE,3); + hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); gtk_container_add(GTK_CONTAINER(stat_fr), hbox); - vbox_l = gtk_vbox_new(FALSE, 3); + vbox_l = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(hbox), vbox_l, TRUE, TRUE, 0); - hbox_l1 = gtk_hbox_new(FALSE,3); + hbox_l1 = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(vbox_l), hbox_l1, TRUE, TRUE, 0); u_data->analyse_nb->page3->port = gtk_label_new(""); gtk_box_pack_start(GTK_BOX(hbox_l1), u_data->analyse_nb->page3->port, TRUE, TRUE, 0); gtk_misc_set_alignment (GTK_MISC(u_data->analyse_nb->page3->port),0,0); - hbox_l2 = gtk_hbox_new(FALSE,3); + hbox_l2 = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(vbox_l), hbox_l2, TRUE, TRUE, 0); @@ -754,7 +754,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) gtk_misc_set_alignment (GTK_MISC(u_data->analyse_nb->page3->veritag),0,0); gtk_widget_show(vbox_l); - vbox_r=gtk_vbox_new(FALSE, 3); + vbox_r=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_box_pack_start(GTK_BOX(hbox), vbox_r, TRUE, TRUE, 0); u_data->analyse_nb->page3->max_in = gtk_label_new(""); diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c index a44741de68..baa27a60b5 100644 --- a/ui/gtk/sctp_chunk_stat_dlg.c +++ b/ui/gtk/sctp_chunk_stat_dlg.c @@ -609,7 +609,7 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction) g_signal_connect(u_data->io->window, "destroy", G_CALLBACK(chunk_dlg_destroy), u_data); /* 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(u_data->io->window), vbox1); gtk_widget_show(vbox1); @@ -674,7 +674,7 @@ sctp_chunk_dlg(struct sctp_udata *u_data) g_signal_connect(u_data->io->window, "destroy", G_CALLBACK(on_destroy), u_data); /* 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(u_data->io->window), main_vb); diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c index c66cf6767a..70dc97894a 100644 --- a/ui/gtk/sctp_stat_dlg.c +++ b/ui/gtk/sctp_stat_dlg.c @@ -567,7 +567,7 @@ gtk_sctpstat_dlg(void) g_signal_connect(sctp_stat_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_stat_dlg_w), vbox1); gtk_widget_show(vbox1); diff --git a/ui/gtk/sip_stat.c b/ui/gtk/sip_stat.c index 4b60c79ec4..2d3205c78e 100644 --- a/ui/gtk/sip_stat.c +++ b/ui/gtk/sip_stat.c @@ -605,7 +605,7 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_) /* Create container for all 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(sp->win), main_vb); @@ -673,7 +673,7 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_) gtk_container_add(GTK_CONTAINER(main_vb), request_fr); gtk_container_set_border_width(GTK_CONTAINER(request_fr), 0); - sp->request_box = gtk_vbox_new(FALSE, 10); + sp->request_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 10, FALSE); gtk_container_add(GTK_CONTAINER(request_fr), sp->request_box); sp->average_setup_time = 0; diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c index eed4fc86d7..f8e7a6532a 100644 --- a/ui/gtk/smb2_stat.c +++ b/ui/gtk/smb2_stat.c @@ -151,7 +151,7 @@ gtk_smb2stat_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(ss->win), 550, 400); smb2stat_set_title(ss); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(ss->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c index eeded06c88..f9e0845198 100644 --- a/ui/gtk/smb_stat.c +++ b/ui/gtk/smb_stat.c @@ -173,7 +173,7 @@ gtk_smbstat_init(const char *optarg, void *userdata _U_) gtk_window_set_default_size(GTK_WINDOW(ss->win), 550, 600); smbstat_set_title(ss); - vbox=gtk_vbox_new(FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(ss->win), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c index 96158c2e65..405948b255 100644 --- a/ui/gtk/stats_tree_stat.c +++ b/ui/gtk/stats_tree_stat.c @@ -250,7 +250,7 @@ init_gtk_tree(const char* optarg, void *userdata _U_) gtk_window_set_title(GTK_WINDOW(st->pr->win), title); g_free(title); - 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(st->pr->win), main_vb); diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index 465e26719b..67c864d86c 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -732,7 +732,7 @@ static void create_drawing_area (struct graph *g) #if 0 /* Prep. to include the controls in the graph window */ - vbox = gtk_vbox_new (FALSE, 0); + vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add (GTK_CONTAINER (g->toplevel), vbox); gtk_container_set_border_width (GTK_CONTAINER (g->toplevel), 5); gtk_widget_show (vbox); @@ -746,7 +746,7 @@ static void create_drawing_area (struct graph *g) /*gtk_box_pack_start (GTK_BOX (vbox), g->gui.control_panel, FALSE, FALSE, 0);*/ - 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, 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); @@ -885,7 +885,7 @@ static void control_panel_add_zoom_page (struct graph *g, GtkWidget *n) gtk_container_set_border_width (GTK_CONTAINER (zoom_frame), 5); zoom_lock_frame = control_panel_create_zoomlock_group (g); gtk_container_set_border_width (GTK_CONTAINER (zoom_lock_frame), 5); - box = gtk_vbox_new (FALSE, 0); + box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_box_pack_start (GTK_BOX (box), zoom_frame, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box), zoom_lock_frame, TRUE, TRUE, 0); gtk_widget_show (box); @@ -916,7 +916,7 @@ static void control_panel_add_origin_page (struct graph *g, GtkWidget *n) gtk_radio_button_get_group (GTK_RADIO_BUTTON (time_orig_cap)), "beginning of this TCP connection"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (time_orig_conn), TRUE); - time_orig_box = gtk_vbox_new (TRUE, 0); + time_orig_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_box_pack_start (GTK_BOX (time_orig_box), time_orig_conn, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (time_orig_box), time_orig_cap, TRUE, TRUE, 0); time_orig_frame = gtk_frame_new ("Time origin"); @@ -929,7 +929,7 @@ static void control_panel_add_origin_page (struct graph *g, GtkWidget *n) seq_orig_zero = gtk_radio_button_new_with_label (gtk_radio_button_get_group ( GTK_RADIO_BUTTON (seq_orig_isn)), "0 (=absolute)"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (seq_orig_isn), TRUE); - seq_orig_box = gtk_vbox_new (TRUE, 0); + seq_orig_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_box_pack_start (GTK_BOX (seq_orig_box), seq_orig_isn, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (seq_orig_box), seq_orig_zero, TRUE, TRUE, 0); seq_orig_frame = gtk_frame_new ("Sequence number origin"); @@ -942,7 +942,7 @@ static void control_panel_add_origin_page (struct graph *g, GtkWidget *n) g_signal_connect(time_orig_conn, "toggled", G_CALLBACK(callback_time_origin), g); g_signal_connect(seq_orig_isn, "toggled", G_CALLBACK(callback_seq_origin), g); - box = gtk_vbox_new (FALSE, 0); + box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width (GTK_CONTAINER (box), 5); gtk_box_pack_start (GTK_BOX (box), time_orig_frame, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box), seq_orig_frame, TRUE, TRUE, 0); @@ -998,7 +998,7 @@ static void callback_create_help(GtkWidget *widget _U_, gpointer data _U_) toplevel = dlg_window_new ("Help for TCP graphing"); gtk_window_set_default_size(GTK_WINDOW(toplevel), 500, 400); - vbox = gtk_vbox_new (FALSE, 3); + vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); gtk_container_add (GTK_CONTAINER (toplevel), vbox); @@ -1051,7 +1051,7 @@ static GtkWidget *control_panel_create_zoom_group (struct graph *g) zoom_out = gtk_radio_button_new_with_label ( gtk_radio_button_get_group (GTK_RADIO_BUTTON (zoom_in)), "out"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (zoom_in), TRUE); - zoom_inout_box = gtk_hbox_new (FALSE, 0); + zoom_inout_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_box_pack_start (GTK_BOX (zoom_inout_box), zoom_in, FALSE, FALSE, 10); gtk_box_pack_start (GTK_BOX (zoom_inout_box), zoom_out, FALSE, FALSE, 0); @@ -1117,7 +1117,7 @@ static GtkWidget *control_panel_create_zoom_group (struct graph *g) gtk_table_attach (GTK_TABLE (zoom_step_table), zoom_ratio_toggle, 0,2,3,4, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0); - zoom_box = gtk_vbox_new (FALSE, 0); + zoom_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_box_pack_start (GTK_BOX (zoom_box), zoom_inout_box, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (zoom_box), zoom_separator1, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (zoom_box), zoom_table, TRUE, TRUE, 0); @@ -1291,7 +1291,7 @@ static GtkWidget *control_panel_create_magnify_group (struct graph *g) gtk_container_add (GTK_CONTAINER (mag_zoom_frame), mag_zoom_table); gtk_container_set_border_width (GTK_CONTAINER (mag_zoom_frame), 3); - mag_box = gtk_vbox_new (FALSE, 0); + mag_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_box_pack_start (GTK_BOX (mag_box), mag_wh_table, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (mag_box), mag_zoom_frame, TRUE, TRUE, 0); mag_frame = gtk_frame_new ("Magnify"); @@ -1422,7 +1422,7 @@ static GtkWidget *control_panel_create_zoomlock_group (struct graph *g) gtk_radio_button_get_group (GTK_RADIO_BUTTON (zoom_lock_none)), "vertical"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (zoom_lock_none), TRUE); - zoom_lock_box = gtk_hbox_new (FALSE, 0); + zoom_lock_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_box_pack_start(GTK_BOX(zoom_lock_box), zoom_lock_none, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(zoom_lock_box), zoom_lock_h, TRUE, TRUE, 0); @@ -1465,11 +1465,11 @@ static GtkWidget *control_panel_create_cross_group (struct graph *g) on = gtk_radio_button_new_with_label ( gtk_radio_button_get_group (GTK_RADIO_BUTTON (off)), "on"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (off), TRUE); - box = gtk_hbox_new (FALSE, 0); + box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 10); gtk_box_pack_start (GTK_BOX (box), off, FALSE, FALSE, 10); gtk_box_pack_start (GTK_BOX (box), on, FALSE, FALSE, 0); - vbox = gtk_vbox_new (FALSE, 0); + vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 15); /* frame = gtk_frame_new ("Cross:"); */ frame = gtk_frame_new (NULL); @@ -1538,7 +1538,7 @@ static GtkWidget *control_panel_create_graph_type_group (struct graph *g) } graph_init = gtk_check_button_new_with_label ("Init on change"); graph_sep = gtk_hseparator_new (); - graph_box = gtk_vbox_new (FALSE, 0); + graph_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_box_pack_start (GTK_BOX (graph_box), graph_rtt, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (graph_box), graph_tput, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (graph_box), graph_tseqstevens, TRUE, TRUE, 0); diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index 4b9c59d410..61a6bbf36b 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -1758,7 +1758,7 @@ wlanstat_dlg_create (void) wlanstat_dlg_w = window_new_with_geom (GTK_WINDOW_TOPLEVEL, title, "WLAN Statistics"); gtk_window_set_default_size (GTK_WINDOW(wlanstat_dlg_w), 750, 400); - vbox=gtk_vbox_new (FALSE, 3); + vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(wlanstat_dlg_w), vbox); gtk_container_set_border_width (GTK_CONTAINER(vbox), 6); @@ -1770,7 +1770,7 @@ wlanstat_dlg_create (void) /* init a scrolled window for overview */ wlanstat_name_lb = gtk_frame_new("Network Overview"); gtk_paned_pack1(GTK_PANED(wlanstat_pane), wlanstat_name_lb, FALSE, TRUE); - selected_vb = gtk_vbox_new(FALSE, 0); + selected_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(wlanstat_name_lb), selected_vb); gtk_container_set_border_width(GTK_CONTAINER(selected_vb), 5); @@ -1829,7 +1829,7 @@ wlanstat_dlg_create (void) /* init a scrolled window for details */ frame = gtk_frame_new("Selected Network"); gtk_paned_pack2(GTK_PANED(wlanstat_pane), frame, FALSE, TRUE); - selected_vb = gtk_vbox_new(FALSE, 0); + selected_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); gtk_container_add(GTK_CONTAINER(frame), selected_vb); gtk_container_set_border_width(GTK_CONTAINER(selected_vb), 5); @@ -1898,7 +1898,7 @@ wlanstat_dlg_create (void) return; } - 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"); -- cgit v1.2.3