osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Evan Huus Convert a bunch more GTK-2 calls to their cross-version ws_ equivalent 

svn path=/trunk/; revision=43009
This commit is contained in:
Anders Broman 2012-06-02 23:53:04 +00:00
parent aa95f6b73d
commit dbc4b09004
9 changed files with 104 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ui/gtk/airpcap_dlg.c
View File

@ -998,7 +998,7 @@ on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data)
gtk_container_set_border_width (GTK_CONTAINER (add_key_window), 5);
gtk_window_set_resizable (GTK_WINDOW (add_key_window), FALSE);
main_v_box = gtk_vbox_new (FALSE, 0);
main_v_box = ws_gtk_box_new (GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_widget_set_name (main_v_box, "main_v_box");
gtk_widget_show (main_v_box);
gtk_container_add (GTK_CONTAINER (add_key_window), main_v_box);
@ -1074,7 +1074,7 @@ on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (add_ssid_lb), GTK_JUSTIFY_CENTER);
low_h_button_box = gtk_hbutton_box_new ();
low_h_button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_widget_set_name (low_h_button_box, "low_h_button_box");
gtk_container_set_border_width (GTK_CONTAINER (low_h_button_box), 5);
gtk_widget_show (low_h_button_box);
@ -1226,7 +1226,7 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data)
gtk_container_set_border_width (GTK_CONTAINER (edit_key_window), 5);
gtk_window_set_resizable (GTK_WINDOW (edit_key_window), FALSE);
main_v_box = gtk_vbox_new (FALSE, 0);
main_v_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_widget_set_name (main_v_box, "main_v_box");
gtk_widget_show (main_v_box);
gtk_container_add (GTK_CONTAINER (edit_key_window), main_v_box);
@ -1320,7 +1320,7 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (edit_ssid_lb), GTK_JUSTIFY_CENTER);
low_h_button_box = gtk_hbutton_box_new ();
low_h_button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_widget_set_name (low_h_button_box, "low_h_button_box");
gtk_container_set_border_width (GTK_CONTAINER (low_h_button_box), 5);
gtk_widget_show (low_h_button_box);
@ -1696,12 +1696,12 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data)
gtk_window_set_resizable (GTK_WINDOW (airpcap_advanced_w), FALSE);
gtk_window_set_type_hint (GTK_WINDOW (airpcap_advanced_w), GDK_WINDOW_TYPE_HINT_DIALOG);
main_box = gtk_vbox_new (FALSE, 0);
main_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_widget_set_name (main_box, "main_box");
gtk_widget_show (main_box);
gtk_container_add (GTK_CONTAINER (airpcap_advanced_w), main_box);
settings_sub_box = gtk_vbox_new (FALSE, 0);
settings_sub_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_widget_set_name (settings_sub_box, "settings_sub_box");
gtk_widget_show (settings_sub_box);
gtk_box_pack_start (GTK_BOX (main_box), settings_sub_box, FALSE, TRUE, 0);
@ -1719,7 +1719,7 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data)
gtk_container_add (GTK_CONTAINER (interface_fr), interface_al);
gtk_alignment_set_padding (GTK_ALIGNMENT (interface_al), 5, 5, 0, 0);
interface_sub_h_box = gtk_hbox_new (FALSE, 0);
interface_sub_h_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
gtk_widget_set_name (interface_sub_h_box, "interface_sub_h_box");
gtk_widget_show (interface_sub_h_box);
gtk_container_add (GTK_CONTAINER (interface_al), interface_sub_h_box);
@ -1872,7 +1872,7 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
basic_parameters_fcs_h_box = gtk_hbox_new (FALSE, 1);
basic_parameters_fcs_h_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE);
gtk_widget_set_name (basic_parameters_fcs_h_box,
"basic_parameters_fcs_h_box");
gtk_widget_show (basic_parameters_fcs_h_box);
@ -1912,12 +1912,12 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data)
gtk_frame_set_label_widget (GTK_FRAME (basic_parameters_fr),basic_parameters_frame_lb);
gtk_label_set_use_markup (GTK_LABEL (basic_parameters_frame_lb), TRUE);
low_buttons_h_box = gtk_hbox_new (FALSE, 0);
low_buttons_h_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
gtk_widget_set_name (low_buttons_h_box, "low_buttons_h_box");
gtk_widget_show (low_buttons_h_box);
gtk_box_pack_end (GTK_BOX (main_box), low_buttons_h_box, FALSE, FALSE, 0);
left_h_button_box = gtk_hbutton_box_new ();
left_h_button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_widget_set_name (left_h_button_box, "left_h_button_box");
gtk_widget_show (left_h_button_box);
gtk_box_pack_start (GTK_BOX (low_buttons_h_box), left_h_button_box, FALSE,
@ -2086,7 +2086,7 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data)
gtk_window_set_resizable (GTK_WINDOW (key_management_w), FALSE);
gtk_window_set_type_hint (GTK_WINDOW (key_management_w), GDK_WINDOW_TYPE_HINT_DIALOG);
main_box = gtk_vbox_new (FALSE, 0);
main_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_widget_set_name (main_box, "main_box");
gtk_widget_show (main_box);
gtk_container_add (GTK_CONTAINER (key_management_w), main_box);
@ -2105,7 +2105,7 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data)
gtk_alignment_set_padding (GTK_ALIGNMENT (keys_al), 0, 0, 12, 0);
keys_h_sub_box = gtk_vbox_new (FALSE, 0);
keys_h_sub_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_widget_set_name (keys_h_sub_box, "keys_h_sub_box");
gtk_widget_show (keys_h_sub_box);
gtk_container_add (GTK_CONTAINER (keys_al), keys_h_sub_box);
@ -2137,7 +2137,7 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data)
/* Set correct decryption mode!!!! */
update_decryption_mode(decryption_mode_cb);
keys_v_sub_box = gtk_hbox_new (FALSE, 0);
keys_v_sub_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
gtk_widget_set_name (keys_v_sub_box, "keys_v_sub_box");
gtk_widget_show (keys_v_sub_box);
gtk_box_pack_start (GTK_BOX (keys_h_sub_box), keys_v_sub_box, TRUE, TRUE, 0);
@ -2220,7 +2220,7 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data)
gtk_container_add (GTK_CONTAINER (keys_scrolled_w), key_list);
key_v_button_box = gtk_vbutton_box_new ();
key_v_button_box = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_widget_set_name (key_v_button_box, "key_v_button_box");
gtk_widget_show (key_v_button_box);
gtk_box_pack_start (GTK_BOX (keys_v_sub_box), key_v_button_box, FALSE, TRUE,
@ -2283,12 +2283,12 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data)
gtk_frame_set_label_widget (GTK_FRAME (keys_fr), keys_frame_lb);
gtk_label_set_use_markup (GTK_LABEL (keys_frame_lb), TRUE);
low_buttons_h_box = gtk_hbox_new (FALSE, 0);
low_buttons_h_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
gtk_widget_set_name (low_buttons_h_box, "low_buttons_h_box");
gtk_widget_show (low_buttons_h_box);
gtk_box_pack_end (GTK_BOX (main_box), low_buttons_h_box, FALSE, FALSE, 0);
left_h_button_box = gtk_hbutton_box_new ();
left_h_button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_widget_set_name (left_h_button_box, "left_h_button_box");
gtk_widget_show (left_h_button_box);
gtk_box_pack_start (GTK_BOX (low_buttons_h_box), left_h_button_box, FALSE,
@ -2676,7 +2676,7 @@ airpcap_keys_check_w(GtkWidget *w, gpointer data _U_)
gtk_widget_set_name (keys_check_w, "keys_check_w");
gtk_window_set_resizable (GTK_WINDOW (keys_check_w), FALSE);
main_v_box = gtk_vbox_new (FALSE, 0);
main_v_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_widget_set_name (main_v_box, "main_v_box");
gtk_widget_show (main_v_box);
gtk_container_add (GTK_CONTAINER (keys_check_w), main_v_box);
@ -2771,7 +2771,7 @@ airpcap_keys_check_w(GtkWidget *w, gpointer data _U_)
gtk_label_set_line_wrap (GTK_LABEL (ignore_lb), TRUE);
gtk_misc_set_alignment (GTK_MISC (ignore_lb), 0, 0.5);
low_h_button_box = gtk_hbutton_box_new ();
low_h_button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_widget_set_name (low_h_button_box, "low_h_button_box");
gtk_widget_show (low_h_button_box);
gtk_box_pack_start (GTK_BOX (main_v_box), low_h_button_box, FALSE, FALSE,

96
ui/gtk/capture_dlg.c
View File

@ -1201,7 +1201,7 @@ capture_remote_cb(GtkWidget *w, gboolean focus_username)
g_object_set_data(G_OBJECT(new_interfaces_w), E_CAP_REMOTE_DIALOG_PTR_KEY, remote_w);
g_free(title);
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(remote_w), main_vb);
@ -1231,7 +1231,7 @@ capture_remote_cb(GtkWidget *w, gboolean focus_username)
auth_fr = gtk_frame_new("Authentication");
gtk_container_add(GTK_CONTAINER(main_vb), auth_fr);
auth_vb = gtk_vbox_new(FALSE, 3);
auth_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(auth_vb), 5);
gtk_container_add(GTK_CONTAINER(auth_fr), auth_vb);
@ -1424,7 +1424,7 @@ options_remote_cb(GtkWidget *w _U_, gpointer d _U_)
g_object_set_data(G_OBJECT(opt_remote_w), E_OPT_REMOTE_CALLER_PTR_KEY, caller);
g_object_set_data(G_OBJECT(caller), E_OPT_REMOTE_DIALOG_PTR_KEY, opt_remote_w);
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(opt_remote_w), main_vb);
@ -1432,7 +1432,7 @@ options_remote_cb(GtkWidget *w _U_, gpointer d _U_)
capture_fr = gtk_frame_new("Capture Options");
gtk_container_add(GTK_CONTAINER(main_vb), capture_fr);
capture_vb = gtk_vbox_new(FALSE, 0);
capture_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(capture_vb), 5);
gtk_container_add(GTK_CONTAINER(capture_fr), capture_vb);
@ -1451,7 +1451,7 @@ options_remote_cb(GtkWidget *w _U_, gpointer d _U_)
sampling_fr = gtk_frame_new("Sampling Options");
gtk_container_add(GTK_CONTAINER(main_vb), sampling_fr);
sampling_vb = gtk_vbox_new(FALSE, 0);
sampling_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(sampling_vb), 5);
gtk_container_add(GTK_CONTAINER(sampling_fr), sampling_vb);
@ -1956,7 +1956,7 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
g_object_set_data(G_OBJECT(opt_edit_w), E_OPT_EDIT_CALLER_PTR_KEY, caller);
g_object_set_data(G_OBJECT(caller), E_OPT_EDIT_DIALOG_PTR_KEY, opt_edit_w);
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(opt_edit_w), main_vb);
@ -1964,12 +1964,12 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
capture_fr = gtk_frame_new("Capture");
gtk_container_add(GTK_CONTAINER(main_vb), capture_fr);
capture_vb = gtk_vbox_new(FALSE, 3);
capture_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(capture_vb), 5);
gtk_container_add(GTK_CONTAINER(capture_fr), capture_vb);
/* Interface row */
if_hb = gtk_hbox_new(FALSE, 3);
if_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_box_pack_start(GTK_BOX(capture_vb), if_hb, FALSE, FALSE, 3);
if_lb = gtk_label_new("Interface: ");
@ -1979,13 +1979,13 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
gtk_box_pack_start(GTK_BOX(if_hb), if_lb_name, FALSE, FALSE, 3);
/* IP addresses row */
if_ip_hb = gtk_hbox_new(FALSE, 3);
if_ip_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_widget_set_tooltip_text(if_ip_hb, "Lists the IP address(es) "
"assigned to the selected interface. ");
if_vb_left = gtk_vbox_new(FALSE, 3);
if_vb_left = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_box_pack_start(GTK_BOX(if_ip_hb), if_vb_left, FALSE, FALSE, 3);
if_vb_right = gtk_vbox_new(FALSE, 3);
if_vb_right = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
if_ip_lb = gtk_label_new("IP address:");
gtk_misc_set_alignment(GTK_MISC(if_ip_lb), 0, 0); /* Left justified */
@ -2022,23 +2022,23 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
gtk_misc_set_alignment(GTK_MISC(if_ip_name), 0, 0); /* Left justified */
gtk_box_pack_start(GTK_BOX(if_vb_right), if_ip_name, FALSE, FALSE, 0);
}
main_hb = gtk_hbox_new(FALSE, 5);
main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(main_hb), 0);
gtk_box_pack_start(GTK_BOX(capture_vb), main_hb, FALSE, FALSE, 3);
left_vb = gtk_vbox_new(FALSE, 0);
left_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(left_vb), 0);
gtk_box_pack_start(GTK_BOX(main_hb), left_vb, TRUE, TRUE, 0);
#if defined (HAVE_AIRPCAP) || defined (HAVE_PCAP_REMOTE) || defined (HAVE_PCAP_CREATE)
/* Avoid adding the right vbox if not needed, because it steals 3 pixels */
right_vb = gtk_vbox_new(FALSE, 3);
right_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(right_vb), 0);
gtk_box_pack_start(GTK_BOX(main_hb), right_vb, FALSE, FALSE, 3);
#endif
/* Linktype row */
linktype_hb = gtk_hbox_new(FALSE, 3);
linktype_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_box_pack_start(GTK_BOX(left_vb), linktype_hb, FALSE, FALSE, 0);
linktype_lb = gtk_label_new("Link-layer header type:");
@ -2151,7 +2151,7 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
*/
/* Capture length row */
snap_hb = gtk_hbox_new(FALSE, 3);
snap_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_box_pack_start (GTK_BOX(left_vb), snap_hb, FALSE, FALSE, 0);
snap_cb = gtk_check_button_new_with_mnemonic("_Limit each packet to");
@ -2178,7 +2178,7 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
gtk_widget_set_sensitive(GTK_WIDGET(snap_sb), device.has_snaplen);
/* 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(capture_vb), filter_hb, FALSE, FALSE, 0);
filter_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY);
@ -2234,7 +2234,7 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
#endif
#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
buffer_size_hb = gtk_hbox_new(FALSE, 3);
buffer_size_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
buffer_size_lb = gtk_label_new("Buffer size:");
gtk_box_pack_start (GTK_BOX(buffer_size_hb), buffer_size_lb, FALSE, FALSE, 0);
@ -3199,7 +3199,7 @@ show_add_interfaces_dialog(void)
gtk_window_set_destroy_with_parent (GTK_WINDOW(new_interfaces_w), TRUE);
gtk_window_set_default_size(GTK_WINDOW(new_interfaces_w), 550, 200);
vbox=gtk_vbox_new(FALSE, 3);
vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_add(GTK_CONTAINER(new_interfaces_w), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
@ -3207,27 +3207,27 @@ show_add_interfaces_dialog(void)
gtk_box_pack_start(GTK_BOX(vbox), main_nb, TRUE, TRUE, 0);
/* Pipes */
temp_page = gtk_vbox_new(FALSE, 6);
temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE);
tmp = gtk_label_new("Pipes");
gtk_widget_show(tmp);
hbox = gtk_hbox_new(FALSE, 3);
hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_container_add(GTK_CONTAINER(hbox), tmp);
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
/* Pipe row */
pipe_hb = gtk_hbox_new(FALSE, 20);
pipe_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 20, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(pipe_hb), 5);
gtk_box_pack_start(GTK_BOX(temp_page), pipe_hb, FALSE, FALSE, 0);
/* Container for each row of widgets */
pipe_vb = gtk_vbox_new(FALSE, 0);
pipe_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(pipe_vb), 0);
gtk_container_add(GTK_CONTAINER(pipe_hb), pipe_vb);
gtk_widget_show(pipe_vb);
/* Top row: Buttons and pipe list */
top_hb = gtk_hbox_new(FALSE, 0);
top_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
gtk_container_add(GTK_CONTAINER(pipe_vb), top_hb);
gtk_widget_show(top_hb);
@ -3235,7 +3235,7 @@ show_add_interfaces_dialog(void)
gtk_box_pack_start(GTK_BOX(top_hb), edit_fr, FALSE, FALSE, 0);
gtk_widget_show(edit_fr);
list_bb = gtk_vbox_new(TRUE, 0);
list_bb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, TRUE);
gtk_container_set_border_width(GTK_CONTAINER(list_bb), 5);
gtk_container_add(GTK_CONTAINER(edit_fr), list_bb);
gtk_widget_show(list_bb);
@ -3292,12 +3292,12 @@ show_add_interfaces_dialog(void)
gtk_box_pack_start(GTK_BOX(pipe_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);
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);
@ -3335,14 +3335,14 @@ show_add_interfaces_dialog(void)
g_object_set_data(G_OBJECT(new_interfaces_w), E_CAP_PIPE_TE_KEY, pipe_te);
/* Local interfaces */
temp_page = gtk_vbox_new(FALSE, 6);
temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE);
tmp = gtk_label_new("Local Interfaces");
gtk_widget_show(tmp);
hbox = gtk_hbox_new(FALSE, 3);
hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_container_add(GTK_CONTAINER(hbox), tmp);
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
local_vb = gtk_vbox_new(FALSE, 0);
local_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(local_vb), 0);
gtk_container_add(GTK_CONTAINER(temp_page), local_vb);
gtk_widget_show(local_vb);
@ -3401,14 +3401,14 @@ show_add_interfaces_dialog(void)
#if defined (HAVE_PCAP_REMOTE)
/* remote interfaces */
temp_page = gtk_vbox_new(FALSE, 6);
temp_page = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE);
tmp = gtk_label_new("Remote Interfaces");
gtk_widget_show(tmp);
hbox = gtk_hbox_new(FALSE, 3);
hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_container_add(GTK_CONTAINER(hbox), tmp);
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
remote_vb = gtk_vbox_new(FALSE, 0);
remote_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(remote_vb), 0);
gtk_container_add(GTK_CONTAINER(temp_page), remote_vb);
gtk_widget_show(remote_vb);
@ -3461,7 +3461,7 @@ show_add_interfaces_dialog(void)
fill_remote_list();
bbox = gtk_hbox_new(FALSE, 0);
bbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
gtk_box_pack_start(GTK_BOX(temp_page), bbox, TRUE, FALSE, 5);
gtk_widget_show(bbox);
@ -3623,7 +3623,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
airpcap_if_active = airpcap_get_default_if(airpcap_if_list);
#endif
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(cap_open_w), main_vb);
@ -3631,7 +3631,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
capture_fr = gtk_frame_new("Capture");
gtk_container_add(GTK_CONTAINER(main_vb), capture_fr);
capture_vb = gtk_vbox_new(FALSE, 3);
capture_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(capture_vb), 5);
gtk_container_add(GTK_CONTAINER(capture_fr), capture_vb);
@ -3714,18 +3714,18 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_IFACE_KEY, view);
main_hb = gtk_hbox_new(FALSE, 5);
main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(main_hb), 3);
gtk_box_pack_start(GTK_BOX(capture_vb), main_hb, FALSE, FALSE, 0);
all_hb = gtk_hbox_new(FALSE, 5);
all_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(all_hb), 0);
gtk_box_pack_start(GTK_BOX(main_hb), all_hb, TRUE, TRUE, 0);
left_vb = gtk_vbox_new(FALSE, 0);
left_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(left_vb), 0);
gtk_box_pack_start(GTK_BOX(all_hb), left_vb, TRUE, TRUE, 0);
right_vb = gtk_vbox_new(FALSE, 3);
right_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(right_vb), 0);
gtk_box_pack_start(GTK_BOX(all_hb), right_vb, FALSE, FALSE, 3);
@ -3763,15 +3763,15 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
g_signal_connect(iftype_cbx, "clicked", G_CALLBACK(show_add_interfaces_dialog), iftype_cbx);
gtk_widget_show(iftype_cbx);
main_hb = gtk_hbox_new(FALSE, 5);
main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(main_hb), 0);
gtk_box_pack_start(GTK_BOX(main_vb), main_hb, FALSE, FALSE, 0);
left_vb = gtk_vbox_new(FALSE, 0);
left_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(left_vb), 0);
gtk_box_pack_start(GTK_BOX(main_hb), left_vb, TRUE, TRUE, 0);
right_vb = gtk_vbox_new(FALSE, 0);
right_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(right_vb), 0);
gtk_box_pack_start(GTK_BOX(main_hb), right_vb, FALSE, FALSE, 0);
@ -3779,12 +3779,12 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
file_fr = gtk_frame_new("Capture File(s)");
gtk_container_add(GTK_CONTAINER(left_vb), file_fr);
file_vb = gtk_vbox_new(FALSE, 3);
file_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(file_vb), 5);
gtk_container_add(GTK_CONTAINER(file_fr), file_vb);
/* File row */
file_hb = gtk_hbox_new(FALSE, 3);
file_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_box_pack_start(GTK_BOX(file_vb), file_hb, FALSE, FALSE, 0);
file_lb = gtk_label_new("File:");
@ -3930,7 +3930,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
limit_fr = gtk_frame_new("Stop Capture ...");
gtk_container_add(GTK_CONTAINER(left_vb), limit_fr);
limit_vb = gtk_vbox_new(FALSE, 3);
limit_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(limit_vb), 5);
gtk_container_add(GTK_CONTAINER(limit_fr), limit_vb);
@ -4010,7 +4010,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
display_fr = gtk_frame_new("Display Options");
gtk_container_add(GTK_CONTAINER(right_vb), display_fr);
display_vb = gtk_vbox_new(FALSE, 0);
display_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(display_vb), 5);
gtk_container_add(GTK_CONTAINER(display_fr), display_vb);
@ -4043,7 +4043,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
resolv_fr = gtk_frame_new("Name Resolution");
gtk_container_add(GTK_CONTAINER(right_vb), resolv_fr);
resolv_vb = gtk_vbox_new(FALSE, 0);
resolv_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(resolv_vb), 5);
gtk_container_add(GTK_CONTAINER(resolv_fr), resolv_vb);

26
ui/gtk/capture_file_dlg.c
View File

@ -512,18 +512,18 @@ file_open_cmd(GtkWidget *w)
}
main_hb = gtk_hbox_new(FALSE, 3);
main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
file_selection_set_extra_widget(file_open_w, main_hb);
gtk_widget_show(main_hb);
/* 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_box_pack_start(GTK_BOX(main_hb), main_vb, FALSE, FALSE, 0);
gtk_widget_show(main_vb);
/* filter row */
filter_hbox = gtk_hbox_new(FALSE, 1);
filter_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(filter_hbox), 0);
gtk_box_pack_start(GTK_BOX(main_vb), filter_hbox, FALSE, FALSE, 0);
gtk_widget_show(filter_hbox);
@ -776,19 +776,19 @@ file_merge_cmd(GtkWidget *w)
break;
}
main_hb = gtk_hbox_new(FALSE, 3);
main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
file_selection_set_extra_widget(file_merge_w, main_hb);
gtk_widget_show(main_hb);
/* 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_box_pack_start(GTK_BOX(main_hb), main_vb, FALSE, FALSE, 0);
gtk_widget_show(main_vb);
/* File type row */
range_tb = NULL;
ft_hb = gtk_hbox_new(FALSE, 3);
ft_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_container_add(GTK_CONTAINER(main_vb), ft_hb);
gtk_widget_show(ft_hb);
@ -805,7 +805,7 @@ file_merge_cmd(GtkWidget *w)
g_object_set_data(G_OBJECT(file_merge_w), E_FILE_TYPE_COMBO_BOX_KEY, ft_combo_box);
ws_combo_box_set_active(GTK_COMBO_BOX(ft_combo_box), 0); /* No callback */
filter_hbox = gtk_hbox_new(FALSE, 1);
filter_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(filter_hbox), 0);
gtk_box_pack_start(GTK_BOX(main_vb), filter_hbox, FALSE, FALSE, 0);
gtk_widget_show(filter_hbox);
@ -1308,14 +1308,14 @@ do_file_save_as(capture_file *cf)
/* 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);
file_selection_set_extra_widget(file_save_as_w, main_vb);
gtk_widget_show(main_vb);
/* File type row */
range_tb = NULL;
ft_hb = gtk_hbox_new(FALSE, 3);
ft_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_container_add(GTK_CONTAINER(main_vb), ft_hb);
gtk_widget_show(ft_hb);
@ -1636,7 +1636,7 @@ file_export_specified_packets_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
/* 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);
file_selection_set_extra_widget(file_export_specified_packets_w, main_vb);
gtk_widget_show(main_vb);
@ -1652,7 +1652,7 @@ file_export_specified_packets_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
gtk_widget_show(range_tb);
/* File type row */
ft_hb = gtk_hbox_new(FALSE, 3);
ft_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_container_add(GTK_CONTAINER(main_vb), ft_hb);
gtk_widget_show(ft_hb);
@ -1937,7 +1937,7 @@ file_color_import_cmd_cb(GtkWidget *color_filters, gpointer filter_list _U_)
FILE_SELECTION_OPEN);
/* 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);
file_selection_set_extra_widget(file_color_import_w, main_vb);
gtk_widget_show(main_vb);
@ -2070,7 +2070,7 @@ file_color_export_cmd_cb(GtkWidget *w _U_, gpointer filter_list)
FILE_SELECTION_SAVE);
/* 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);
file_selection_set_extra_widget(file_color_export_w, main_vb);
gtk_widget_show(main_vb);

2
ui/gtk/capture_if_dlg.c
View File

@ -687,7 +687,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(main_sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(cap_if_w), main_sw);
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_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(main_sw), main_vb);

2
ui/gtk/capture_info_dlg.c
View File

@ -200,7 +200,7 @@ capture_options *capture_opts)
g_free(cap_w_title);
/* Container for capture display widgets */
main_vb = gtk_vbox_new(FALSE, 1);
main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 1, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
gtk_container_add(GTK_CONTAINER(info->cap_w), main_vb);
gtk_widget_show(main_vb);

10
ui/gtk/main.c
View File

@ -3597,7 +3597,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p)
G_CALLBACK(top_level_key_pressed_cb), NULL );
/* Vertical container for menu bar, toolbar(s), paned windows and progress/info box */
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), 0);
gtk_container_add(GTK_CONTAINER(top_level), main_vbox);
gtk_widget_show(main_vbox);
@ -3647,13 +3647,13 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p)
g_object_get_data(G_OBJECT(popup_menu_object), PM_BYTES_VIEW_KEY));
/* Panes for the packet list, tree, and byte view */
main_pane_v1 = gtk_vpaned_new();
main_pane_v1 = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
gtk_widget_show(main_pane_v1);
main_pane_v2 = gtk_vpaned_new();
main_pane_v2 = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
gtk_widget_show(main_pane_v2);
main_pane_h1 = gtk_hpaned_new();
main_pane_h1 = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_widget_show(main_pane_h1);
main_pane_h2 = gtk_hpaned_new();
main_pane_h2 = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_widget_show(main_pane_h2);
#ifdef HAVE_AIRPCAP
airpcap_tb = airpcap_toolbar_new();

24
ui/gtk/main_welcome.c
View File

@ -140,7 +140,7 @@ scroll_box_dynamic_new(GtkWidget *child_box, guint max_childs, guint scrollw_y_s
GtkWidget * parent_box;
parent_box = gtk_vbox_new(FALSE, 0);
parent_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_box_pack_start(GTK_BOX(parent_box), GTK_WIDGET(child_box), TRUE, TRUE, 0);
g_object_set_data(G_OBJECT(parent_box), SCROLL_BOX_CHILD_BOX, child_box);
g_object_set_data(G_OBJECT(parent_box), SCROLL_BOX_MAX_CHILDS, GINT_TO_POINTER(max_childs));
@ -252,7 +252,7 @@ welcome_button(const gchar *stock_item,
GtkWidget *eb, *w, *item_hb, *text_vb;
gchar *formatted_text;
item_hb = gtk_hbox_new(FALSE, 1);
item_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE);
/* event box (for background color and events) */
eb = gtk_event_box_new();
@ -274,7 +274,7 @@ welcome_button(const gchar *stock_item,
w = gtk_image_new_from_stock(stock_item, GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_box_pack_start(GTK_BOX(item_hb), w, FALSE, FALSE, 5);
text_vb = gtk_vbox_new(FALSE, 3);
text_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
/* title */
w = gtk_label_new(title);
@ -350,7 +350,7 @@ welcome_header_new(void)
GtkWidget *eb;
GtkWidget *icon;
item_vb = gtk_vbox_new(FALSE, 0);
item_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
/* colorize vbox */
eb = gtk_event_box_new();
@ -360,7 +360,7 @@ welcome_header_new(void)
#else
gtk_widget_modify_bg(eb, GTK_STATE_NORMAL, &header_bar_bg);
#endif
item_hb = gtk_hbox_new(FALSE, 0);
item_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
gtk_box_pack_start(GTK_BOX(item_vb), item_hb, FALSE, FALSE, 10);
/*icon = xpm_to_widget_from_parent(top_level, wssplash_xpm);*/
@ -448,12 +448,12 @@ welcome_topic_new(const char *header, GtkWidget **to_fill)
GtkWidget *topic_header;
topic_vb = gtk_vbox_new(FALSE, 0);
topic_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
topic_header = welcome_topic_header_new(header);
gtk_box_pack_start(GTK_BOX(topic_vb), topic_header, FALSE, FALSE, 0);
layout_vb = gtk_vbox_new(FALSE, 5);
layout_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(layout_vb), 10);
gtk_box_pack_start(GTK_BOX(topic_vb), layout_vb, FALSE, FALSE, 0);
@ -1245,7 +1245,7 @@ welcome_new(void)
#endif
welcome_scrollw = scrolled_window_new(NULL, NULL);
welcome_vb = gtk_vbox_new(FALSE, 0);
welcome_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
welcome_eb = gtk_event_box_new();
gtk_container_add(GTK_CONTAINER(welcome_eb), welcome_vb);
@ -1259,13 +1259,13 @@ welcome_new(void)
gtk_box_pack_start(GTK_BOX(welcome_vb), header, FALSE, FALSE, 0);
/* content */
welcome_hb = gtk_hbox_new(FALSE, 10);
welcome_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(welcome_hb), 10);
gtk_box_pack_start(GTK_BOX(welcome_vb), welcome_hb, TRUE, TRUE, 0);
/* column capture */
column_vb = gtk_vbox_new(FALSE, 10);
column_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 10, FALSE);
#if GTK_CHECK_VERSION(3,0,0)
gtk_widget_override_background_color(column_vb, GTK_STATE_NORMAL, &rgba_welcome_bg);
#else
@ -1335,7 +1335,7 @@ welcome_new(void)
gtk_misc_set_alignment (GTK_MISC(w), 0.0f, 0.0f);
gtk_box_pack_start(GTK_BOX(topic_to_fill), w, FALSE, FALSE, 5);
file_child_box = gtk_vbox_new(FALSE, 1);
file_child_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 1, FALSE);
/* 17 file items or 300 pixels height is about the size */
/* that still fits on a screen of about 1000*700 */
welcome_file_panel_vb = scroll_box_dynamic_new(GTK_WIDGET(file_child_box), 17, 300);
@ -1354,7 +1354,7 @@ welcome_new(void)
/* column online */
column_vb = gtk_vbox_new(FALSE, 10);
column_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 10, FALSE);
gtk_box_pack_start(GTK_BOX(welcome_hb), column_vb, TRUE, TRUE, 0);
/* topic online */

10
ui/gtk/prefs_dlg.c
View File

@ -336,7 +336,7 @@ module_prefs_show(module_t *module, gpointer user_data)
g_object_set_data(G_OBJECT(main_sw), E_PAGESW_FRAME_KEY, frame);
/* Main vertical box */
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(frame), main_vb);
@ -450,13 +450,13 @@ prefs_page_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page)
*/
/* Container for each row of widgets */
cts.main_vb = gtk_vbox_new(FALSE, 5);
cts.main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(cts.main_vb), 5);
gtk_container_add(GTK_CONTAINER(prefs_w), cts.main_vb);
gtk_widget_show(cts.main_vb);
/* Top row: Preferences tree and notebook */
top_hb = gtk_hbox_new(FALSE, 10);
top_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10, FALSE);
gtk_container_add(GTK_CONTAINER(cts.main_vb), top_hb);
gtk_widget_show(top_hb);
@ -705,7 +705,7 @@ create_preference_radio_buttons(GtkWidget *main_tb, int table_position,
set_option_label(main_tb, table_position, label_text, tooltip_text);
radio_button_hbox = gtk_hbox_new(FALSE, 0);
radio_button_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
rb_group = NULL;
for (enum_valp = enumvals, idx = 0; enum_valp->name != NULL;
enum_valp++, idx++) {
@ -815,7 +815,7 @@ create_preference_option_menu(GtkWidget *main_tb, int table_position,
* as the widest entry, rather than being as wide as the table
* space.
*/
menu_box = gtk_hbox_new(FALSE, 0);
menu_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
gtk_box_pack_start(GTK_BOX(menu_box), combo_box, FALSE, FALSE, 0);
event_box = gtk_event_box_new();

1
ui/gtk/tcp_graph.c
View File

@ -39,6 +39,7 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#if GTK_CHECK_VERSION(3,0,0)
#define USE_CROSSHAIR_CURSOR 1
# include <gdk/gdkkeysyms-compat.h>
#endif