diff options
-rw-r--r-- | ui/gtk/expert_comp_dlg.c | 19 | ||||
-rw-r--r-- | ui/gtk/export_object.c | 2 | ||||
-rw-r--r-- | ui/gtk/filter_dlg.c | 9 | ||||
-rw-r--r-- | ui/gtk/filter_expression_save_dlg.c | 6 | ||||
-rw-r--r-- | ui/gtk/find_dlg.c | 12 | ||||
-rw-r--r-- | ui/gtk/flow_graph.c | 4 | ||||
-rw-r--r-- | ui/gtk/follow_stream.c | 6 | ||||
-rw-r--r-- | ui/gtk/funnel_stat.c | 2 | ||||
-rw-r--r-- | ui/gtk/goto_dlg.c | 5 | ||||
-rw-r--r-- | ui/gtk/graph_analysis.c | 4 | ||||
-rw-r--r-- | ui/gtk/gsm_map_summary.c | 12 |
11 files changed, 42 insertions, 39 deletions
diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c index feff00b1a0..f448ac74bf 100644 --- a/ui/gtk/expert_comp_dlg.c +++ b/ui/gtk/expert_comp_dlg.c @@ -811,9 +811,9 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_error_pb_data); gtk_widget_show(image); - gtk_container_add(GTK_CONTAINER(hbox), image); + gtk_box_pack_start(GTK_BOX (hbox), image, FALSE, TRUE, 0); } - gtk_container_add(GTK_CONTAINER(hbox), ss->error_label); + gtk_box_pack_start(GTK_BOX (hbox), ss->error_label, FALSE, TRUE, 0); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox); init_error_table(&ss->error_table, 0, temp_page); @@ -825,9 +825,10 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_warn_pb_data); gtk_widget_show(image); - gtk_container_add(GTK_CONTAINER(hbox), image); + gtk_box_pack_start(GTK_BOX (hbox), image, FALSE, TRUE, 0); + } - gtk_container_add(GTK_CONTAINER(hbox), ss->warn_label); + gtk_box_pack_start(GTK_BOX (hbox), ss->warn_label, FALSE, TRUE, 0); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox); init_error_table(&ss->warn_table, 0, temp_page); @@ -839,9 +840,9 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_note_pb_data); gtk_widget_show(image); - gtk_container_add(GTK_CONTAINER(hbox), image); + gtk_box_pack_start(GTK_BOX (hbox), image, FALSE, TRUE, 0); } - gtk_container_add(GTK_CONTAINER(hbox), ss->note_label); + gtk_box_pack_start(GTK_BOX (hbox), ss->note_label, FALSE, TRUE, 0); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox); init_error_table(&ss->note_table, 0, temp_page); @@ -853,9 +854,9 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_chat_pb_data); gtk_widget_show(image); - gtk_container_add(GTK_CONTAINER(hbox), image); + gtk_box_pack_start(GTK_BOX (hbox), image, FALSE, TRUE, 0); } - gtk_container_add(GTK_CONTAINER(hbox), ss->chat_label); + gtk_box_pack_start(GTK_BOX (hbox), ss->chat_label, FALSE, TRUE, 0); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox); init_error_table(&ss->chat_table, 0, temp_page); @@ -869,7 +870,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) ss->pkt_comments_label = gtk_label_new("Packet Comments: 0/y"); gtk_widget_show(ss->pkt_comments_label); hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); - gtk_container_add(GTK_CONTAINER(hbox), ss->pkt_comments_label); + gtk_box_pack_start(GTK_BOX (hbox), ss->pkt_comments_label, FALSE, TRUE, 0); gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), comments_page, hbox); etd = expert_dlg_new_table(); diff --git a/ui/gtk/export_object.c b/ui/gtk/export_object.c index 164ec60543..00c1961e88 100644 --- a/ui/gtk/export_object.c +++ b/ui/gtk/export_object.c @@ -464,7 +464,7 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN); - gtk_container_add(GTK_CONTAINER(vbox), sw); + gtk_box_pack_start(GTK_BOX (vbox), sw, TRUE, TRUE, 0); object_list->store = gtk_tree_store_new(EO_NUM_COLUMNS, G_TYPE_INT, G_TYPE_STRING, diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c index b0769551b4..23c2357248 100644 --- a/ui/gtk/filter_dlg.c +++ b/ui/gtk/filter_dlg.c @@ -425,12 +425,13 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, /* Container for each row of widgets */ 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_box_pack_start(GTK_BOX (main_vb), filter_vb, TRUE, TRUE, 0); gtk_widget_show(filter_vb); /* Top row: Buttons and filter list */ top_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); - gtk_container_add(GTK_CONTAINER(filter_vb), top_hb); + gtk_box_pack_start(GTK_BOX (filter_vb), top_hb, TRUE, TRUE, 0); + gtk_widget_show(top_hb); edit_fr = gtk_frame_new("Edit"); @@ -509,7 +510,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, /* row: Filter name entry */ middle_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); - gtk_container_add(GTK_CONTAINER(props_vb), middle_hb); + gtk_box_pack_start(GTK_BOX (props_vb), middle_hb, TRUE, TRUE, 0); gtk_widget_show(middle_hb); name_lb = gtk_label_new("Filter name:"); @@ -524,7 +525,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, /* row: Filter text entry */ bottom_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); - gtk_container_add(GTK_CONTAINER(props_vb), bottom_hb); + gtk_box_pack_start(GTK_BOX (props_vb), bottom_hb, TRUE, TRUE, 0); gtk_widget_show(bottom_hb); filter_lb = gtk_label_new("Filter string:"); diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c index f2d4396a8f..6f677e61bb 100644 --- a/ui/gtk/filter_expression_save_dlg.c +++ b/ui/gtk/filter_expression_save_dlg.c @@ -252,7 +252,7 @@ filter_expression_save_dlg(gpointer data) /* */ 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_box_pack_start(GTK_BOX (main_vb), main_filter_save_hb, TRUE, TRUE, 0); gtk_widget_show(main_filter_save_hb); /* Filter Save frame */ @@ -269,8 +269,8 @@ filter_expression_save_dlg(gpointer data) /* filter_save type row */ 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_box_pack_start(GTK_BOX (filter_save_type_vb), filter_save_type_hb, TRUE, TRUE, 0); + gtk_widget_show(filter_save_type_hb); /* filter_save row */ diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c index 2f51f7ffb3..ae935365fa 100644 --- a/ui/gtk/find_dlg.c +++ b/ui/gtk/find_dlg.c @@ -155,7 +155,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* */ main_find_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); - gtk_container_add(GTK_CONTAINER(main_vb), main_find_hb); + gtk_box_pack_start(GTK_BOX (main_vb), main_find_hb, TRUE, TRUE, 0); gtk_widget_show(main_find_hb); @@ -171,7 +171,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* find type row */ find_type_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); - gtk_container_add(GTK_CONTAINER(find_type_vb), find_type_hb); + gtk_box_pack_start(GTK_BOX (find_type_vb), find_type_hb, TRUE, TRUE, 0); gtk_widget_show(find_type_hb); find_type_lb = gtk_label_new("By:"); @@ -226,7 +226,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* */ main_options_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); - gtk_container_add(GTK_CONTAINER(main_vb), main_options_hb); + gtk_box_pack_start(GTK_BOX (main_vb), main_options_hb, TRUE, TRUE, 0); gtk_widget_show(main_options_hb); @@ -274,12 +274,12 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) case_cb = gtk_check_button_new_with_mnemonic("Case sensitive"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(case_cb), !case_type); - gtk_container_add(GTK_CONTAINER(string_opt_vb), case_cb); + gtk_box_pack_start(GTK_BOX (string_opt_vb), case_cb, TRUE, TRUE, 0); gtk_widget_set_tooltip_text(case_cb, "Search by mixed upper/lower case?"); gtk_widget_show(case_cb); combo_lb = gtk_label_new("Character set:"); - gtk_container_add(GTK_CONTAINER(string_opt_vb), combo_lb); + gtk_box_pack_start(GTK_BOX (string_opt_vb), combo_lb, TRUE, TRUE, 0); gtk_misc_set_alignment(GTK_MISC(combo_lb), 0.0f, 0.5f); gtk_widget_show(combo_lb); @@ -294,7 +294,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(combo_cb), "ASCII Unicode"); gtk_combo_box_set_active(GTK_COMBO_BOX(combo_cb),0); - gtk_container_add(GTK_CONTAINER(string_opt_vb), combo_cb); + gtk_box_pack_start(GTK_BOX (string_opt_vb), combo_cb, TRUE, TRUE, 0); gtk_widget_show(combo_cb); diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c index 24f1e30502..a1a3b3ea73 100644 --- a/ui/gtk/flow_graph.c +++ b/ui/gtk/flow_graph.c @@ -600,13 +600,13 @@ flow_graph_dlg_create (void) gtk_box_set_spacing (GTK_BOX (hbuttonbox), 30); bt_ok = gtk_button_new_from_stock(GTK_STOCK_OK); - gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_ok); + gtk_box_pack_start(GTK_BOX (hbuttonbox), bt_ok, FALSE, TRUE, 0); gtk_widget_set_tooltip_text (bt_ok, "Show the flow graph"); g_signal_connect(bt_ok, "clicked", G_CALLBACK(flow_graph_on_ok), flow_graph_dlg_w); gtk_widget_show(bt_ok); bt_cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL); - gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_cancel); + gtk_box_pack_start(GTK_BOX (hbuttonbox), bt_cancel, FALSE, TRUE, 0); #if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(bt_cancel, TRUE); #else diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c index dfec031e83..b2de2496b8 100644 --- a/ui/gtk/follow_stream.c +++ b/ui/gtk/follow_stream.c @@ -295,7 +295,7 @@ follow_find_cb(GtkWidget * w _U_, gpointer data) /* Horizontal box for find label, entry field and up/down radio buttons */ find_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); - gtk_container_add(GTK_CONTAINER(main_vb), find_hb); + gtk_box_pack_start(GTK_BOX (main_vb), find_hb, TRUE, TRUE, 0); gtk_widget_show(find_hb); /* Find label */ @@ -312,7 +312,7 @@ follow_find_cb(GtkWidget * w _U_, gpointer data) /* Buttons row */ buttons_row = dlg_button_row_new(GTK_STOCK_FIND, GTK_STOCK_CANCEL, NULL); - gtk_container_add(GTK_CONTAINER(main_vb), buttons_row); + gtk_box_pack_start(GTK_BOX (main_vb), buttons_row, FALSE, TRUE, 0); find_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_FIND); cancel_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_CANCEL); @@ -744,7 +744,7 @@ follow_stream(gchar *title, follow_info_t *follow_info, } else { stream_fr = gtk_frame_new("Stream Content"); } - gtk_container_add(GTK_CONTAINER(vbox), stream_fr); + gtk_box_pack_start(GTK_BOX (vbox), stream_fr, TRUE, TRUE, 0); gtk_widget_show(stream_fr); stream_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index 282a9fcca3..b8d4f97771 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) { gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6); gtk_container_add(GTK_CONTAINER(tw->win), main_vb); - gtk_container_add(GTK_CONTAINER(main_vb), txt_scrollw); + gtk_box_pack_start(GTK_BOX (main_vb), txt_scrollw, TRUE, TRUE, 0); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw), GTK_SHADOW_IN); diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c index 3005a4ad25..a8f7213cec 100644 --- a/ui/gtk/goto_dlg.c +++ b/ui/gtk/goto_dlg.c @@ -63,7 +63,7 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* Frame number row */ fnumber_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE); - gtk_container_add(GTK_CONTAINER(main_vb), fnumber_hb); + gtk_box_pack_start(GTK_BOX (main_vb), fnumber_hb, TRUE, TRUE, 0); gtk_widget_show(fnumber_hb); fnumber_lb = gtk_label_new("Packet number:"); @@ -76,7 +76,8 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* Button row: OK and cancel buttons */ bbox = dlg_button_row_new(GTK_STOCK_JUMP_TO, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL); - gtk_container_add(GTK_CONTAINER(main_vb), bbox); + gtk_box_pack_start(GTK_BOX (main_vb), bbox, TRUE, TRUE, 0); + gtk_widget_show(bbox); ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_JUMP_TO); diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c index dec9cdc5f7..e1ea36a104 100644 --- a/ui/gtk/graph_analysis.c +++ b/ui/gtk/graph_analysis.c @@ -1952,13 +1952,13 @@ static void dialog_graph_create_window(graph_analysis_data_t *user_data) gtk_widget_show(hbuttonbox); bt_save = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS); - gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_save); + gtk_box_pack_start(GTK_BOX (hbuttonbox), bt_save, FALSE, TRUE, 0); gtk_widget_show(bt_save); g_signal_connect(bt_save, "clicked", G_CALLBACK(on_save_bt_clicked), user_data); gtk_widget_set_tooltip_text(bt_save, "Save an ASCII representation of the graph to a file"); bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close); + gtk_box_pack_start(GTK_BOX (hbuttonbox), bt_close, FALSE, TRUE, 0); #if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(bt_close, TRUE); #else diff --git a/ui/gtk/gsm_map_summary.c b/ui/gtk/gsm_map_summary.c index 4a90350eb7..a6e4ffa8b7 100644 --- a/ui/gtk/gsm_map_summary.c +++ b/ui/gtk/gsm_map_summary.c @@ -100,7 +100,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) /* File frame */ file_fr = gtk_frame_new("File"); - gtk_container_add(GTK_CONTAINER(main_vb), file_fr); + gtk_box_pack_start(GTK_BOX (main_vb), file_fr, TRUE, TRUE, 0); gtk_widget_show(file_fr); file_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); @@ -127,7 +127,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) /* Data frame */ data_fr = gtk_frame_new("Data"); - gtk_container_add(GTK_CONTAINER(main_vb), data_fr); + gtk_box_pack_start(GTK_BOX (main_vb), data_fr, TRUE, TRUE, 0); gtk_widget_show(data_fr); data_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); @@ -172,7 +172,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) /* Invoke frame */ invoke_fr = gtk_frame_new("Invokes"); - gtk_container_add(GTK_CONTAINER(main_vb), invoke_fr); + gtk_box_pack_start(GTK_BOX (main_vb), invoke_fr, TRUE, TRUE, 0); gtk_widget_show(invoke_fr); invoke_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); @@ -228,7 +228,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) /* Return Results frame */ rr_fr = gtk_frame_new("Return Results"); - gtk_container_add(GTK_CONTAINER(main_vb), rr_fr); + gtk_box_pack_start(GTK_BOX (main_vb), rr_fr, TRUE, TRUE, 0); gtk_widget_show(rr_fr); rr_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); @@ -284,7 +284,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) /* Totals frame */ tot_fr = gtk_frame_new("Totals"); - gtk_container_add(GTK_CONTAINER(main_vb), tot_fr); + gtk_box_pack_start(GTK_BOX (main_vb), tot_fr, TRUE, TRUE, 0); gtk_widget_show(tot_fr); tot_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); @@ -339,7 +339,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) /* Button row. */ bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); - gtk_container_add(GTK_CONTAINER(main_vb), bbox); + gtk_box_pack_start(GTK_BOX (main_vb), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox); close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); |