Rename ws_gtk_grid_attach() to ws_gtk_grid_attach_defaults();

Also: fix a typo in a comment in 'gui_utils.h'

svn path=/trunk/; revision=46951

1 files changed, 21 insertions, 21 deletions

diff --git a/ui/gtk/range_utils.c b/ui/gtk/range_utils.c
index be1335ea29..c7ced2a7b8 100644
--- a/ui/gtk/range_utils.c
+++ b/ui/gtk/range_utils.c
@@ -565,13 +565,13 @@ GtkWidget *range_new(packet_range_t *range, gboolean saving)
 
   /* captured button */
   captured_bt = gtk_toggle_button_new_with_mnemonic("_Captured");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), captured_bt, 1, 0, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), captured_bt, 1, 0, 1, 1);
   g_signal_connect(captured_bt, "toggled", G_CALLBACK(toggle_captured_cb), range_grid);
   gtk_widget_set_tooltip_text (captured_bt,("Process all the below chosen packets"));
 
   /* displayed button */
   displayed_bt = gtk_toggle_button_new_with_mnemonic("_Displayed");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), displayed_bt, 2, 0, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), displayed_bt, 2, 0, 1, 1);
   g_signal_connect(displayed_bt, "toggled", G_CALLBACK(toggle_filtered_cb), range_grid);
   if (saving)
     /* XXX: Testing shows there's a limit to the number of tooltip character displayed: 72 ? */
@@ -586,72 +586,72 @@ GtkWidget *range_new(packet_range_t *range, gboolean saving)
 
   /* Process all packets */
   select_all_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_All packets");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_all_rb, 0, 1, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_all_rb, 0, 1, 1, 1);
   gtk_widget_set_tooltip_text (select_all_rb, ("Process all packets"));
   g_signal_connect(select_all_rb, "toggled", G_CALLBACK(toggle_select_all), range_grid);
 
   select_all_c_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_all_c_lb, 1, 1, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_all_c_lb, 1, 1, 1, 1);
   select_all_d_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_all_d_lb, 2, 1, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_all_d_lb, 2, 1, 1, 1);
 
 
   /* Process currently selected */
   select_curr_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb),
                                                                   "_Selected packet only");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_curr_rb, 0, 2, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_curr_rb, 0, 2, 1, 1);
   gtk_widget_set_tooltip_text (select_curr_rb, ("Process the currently selected packet only"));
   g_signal_connect(select_curr_rb, "toggled", G_CALLBACK(toggle_select_selected), range_grid);
 
   select_curr_c_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_curr_c_lb, 1, 2, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_curr_c_lb, 1, 2, 1, 1);
   select_curr_d_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_curr_d_lb, 2, 2, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_curr_d_lb, 2, 2, 1, 1);
 
 
   /* Process marked packets */
   select_marked_only_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb),
                                                                          "_Marked packets only");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_marked_only_rb, 0, 3, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_marked_only_rb, 0, 3, 1, 1);
   gtk_widget_set_tooltip_text (select_marked_only_rb, ("Process marked packets only"));
   g_signal_connect(select_marked_only_rb, "toggled", G_CALLBACK(toggle_select_marked_only), range_grid);
 
   select_marked_only_c_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_marked_only_c_lb, 1, 3, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_marked_only_c_lb, 1, 3, 1, 1);
   select_marked_only_d_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_marked_only_d_lb, 2, 3, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_marked_only_d_lb, 2, 3, 1, 1);
 
 
   /* Process packet range between first and last packet */
   select_marked_range_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb),
                                                                           "From first _to last marked packet");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_marked_range_rb, 0, 4, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_marked_range_rb, 0, 4, 1, 1);
   gtk_widget_set_tooltip_text (select_marked_range_rb,("Process all packets between the first and last marker"));
   g_signal_connect(select_marked_range_rb, "toggled", G_CALLBACK(toggle_select_marked_range), range_grid);
 
   select_marked_range_c_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_marked_range_c_lb, 1, 4, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_marked_range_c_lb, 1, 4, 1, 1);
   select_marked_range_d_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_marked_range_d_lb, 2, 4, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_marked_range_d_lb, 2, 4, 1, 1);
 
 
   /* Process a user specified provided packet range : -10,30,40-70,80- */
   select_user_range_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(select_all_rb),
                                                                         "Specify a packet _range:");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_user_range_rb, 0, 5, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_user_range_rb, 0, 5, 1, 1);
   gtk_widget_set_tooltip_text (select_user_range_rb,("Process a specified packet range"));
   g_signal_connect(select_user_range_rb, "toggled", G_CALLBACK(toggle_select_user_range), range_grid);
 
   select_user_range_c_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_user_range_c_lb, 1, 5, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_user_range_c_lb, 1, 5, 1, 1);
   select_user_range_d_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_user_range_d_lb, 2, 5, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_user_range_d_lb, 2, 5, 1, 1);
 
 
   /* The entry part */
   select_user_range_entry = gtk_entry_new();
   gtk_entry_set_max_length (GTK_ENTRY (select_user_range_entry), 254);
-  ws_gtk_grid_attach(GTK_GRID(range_grid), select_user_range_entry, 0, 6, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), select_user_range_entry, 0, 6, 1, 1);
   gtk_widget_set_tooltip_text (select_user_range_entry,
                                "Specify a range of packet numbers :     \nExample :  1-10,18,25-100,332-");
   g_signal_connect(select_user_range_entry,"changed", G_CALLBACK(range_entry), range_grid);
@@ -659,14 +659,14 @@ GtkWidget *range_new(packet_range_t *range, gboolean saving)
 
   /* Remove ignored packets */
   remove_ignored_cb = gtk_check_button_new_with_mnemonic("Remove _Ignored packets");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), remove_ignored_cb, 0, 7, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), remove_ignored_cb, 0, 7, 1, 1);
   gtk_widget_set_tooltip_text (remove_ignored_cb,("Remove all packets marked as Ignored"));
   g_signal_connect(remove_ignored_cb, "toggled", G_CALLBACK(toggle_remove_ignored), range_grid);
 
   ignored_c_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), ignored_c_lb, 1, 7, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), ignored_c_lb, 1, 7, 1, 1);
   ignored_d_lb = gtk_label_new("?");
-  ws_gtk_grid_attach(GTK_GRID(range_grid), ignored_d_lb, 2, 7, 1, 1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(range_grid), ignored_d_lb, 2, 7, 1, 1);
 
   gtk_widget_show_all(range_grid);