Replace gtk_table...() with ws_gtk_grid...().

svn path=/trunk/; revision=47020

1 files changed, 21 insertions, 21 deletions

diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index 2a11749c33..2bc82f42c5 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -382,9 +382,9 @@ capture_if_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
   }
   window_destroy(GTK_WIDGET(cap_if_w));
   /* Note that we no longer have a "Capture Options" dialog box. */
-  cap_if_w = NULL;
+  cap_if_w      = NULL;
   cap_if_top_vb = NULL;
-  cap_if_sw = NULL;
+  cap_if_sw     = NULL;
 #ifdef HAVE_AIRPCAP
   if (airpcap_if_active)
     airpcap_set_toolbar_stop_capture(airpcap_if_active);
@@ -632,7 +632,7 @@ can_capture(void)
 static void
 capture_if_refresh_if_list(void)
 {
-  GtkWidget      *if_vb, *if_tb, *icon, *if_lb, *eb;
+  GtkWidget      *if_vb, *if_grid, *icon, *if_lb, *eb;
   GString        *if_tool_str = g_string_new("");
   GtkRequisition  requisition;
   int             row = 0, height = 0, curr_height, curr_width;
@@ -670,29 +670,29 @@ capture_if_refresh_if_list(void)
   gtk_container_set_border_width(GTK_CONTAINER(if_vb), 5);
   gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(cap_if_sw), if_vb);
 
-  if_tb = gtk_table_new(1,9, FALSE);
-  gtk_table_set_row_spacings(GTK_TABLE(if_tb), 3);
-  gtk_table_set_col_spacings(GTK_TABLE(if_tb), 3);
-  gtk_box_pack_start(GTK_BOX(if_vb), if_tb, FALSE, FALSE, 0);
+  if_grid = ws_gtk_grid_new();
+  ws_gtk_grid_set_row_spacing(GTK_GRID(if_grid), 3);
+  ws_gtk_grid_set_column_spacing(GTK_GRID(if_grid), 3);
+  gtk_box_pack_start(GTK_BOX(if_vb), if_grid, FALSE, FALSE, 0);
 
   /* This is the icon column, used to display which kind of interface we have */
   if_lb = gtk_label_new("");
-  gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 0, 1, row, row+1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), if_lb, 0, row, 1, 1);
 
   if_lb = gtk_label_new("Device");
-  gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 1, 4, row, row+1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), if_lb, 1, row, 3, 1);
 
   if_lb = gtk_label_new("Description");
-  gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 4, 5, row, row+1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), if_lb, 4, row, 1, 1);
 
   if_lb = gtk_label_new(" IP ");
-  gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 5, 6, row, row+1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), if_lb, 5, row, 1, 1);
 
   if_lb = gtk_label_new("Packets");
-  gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 6, 7, row, row+1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), if_lb, 6, row, 1, 1);
 
   if_lb = gtk_label_new(" Packets/s ");
-  gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 7, 8, row, row+1);
+  ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), if_lb, 7, row, 1, 1);
   row++;
 
   height += 30;
@@ -712,7 +712,7 @@ capture_if_refresh_if_list(void)
       continue;
     }
     data.choose_bt = gtk_check_button_new();
-    gtk_table_attach_defaults(GTK_TABLE(if_tb), data.choose_bt, 0, 1, row, row+1);
+    ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), data.choose_bt, 0, row, 1, 1);
     if (gbl_capture_in_progress) {
       gtk_widget_set_sensitive(data.choose_bt, FALSE);
     } else {
@@ -722,7 +722,7 @@ capture_if_refresh_if_list(void)
     g_signal_connect(data.choose_bt, "toggled", G_CALLBACK(store_selected), device.name);
     /* Kind of adaptor (icon) */
     icon = capture_get_if_icon(&(device));
-    gtk_table_attach_defaults(GTK_TABLE(if_tb), icon, 1, 2, row, row+1);
+    ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), icon, 1, row, 1, 1);
 
      /* device name */
 #ifdef _WIN32
@@ -736,7 +736,7 @@ capture_if_refresh_if_list(void)
     data.device_lb = gtk_label_new(device.name);
 #endif
     gtk_misc_set_alignment(GTK_MISC(data.device_lb), 0.0f, 0.5f);
-    gtk_table_attach_defaults(GTK_TABLE(if_tb), data.device_lb, 2, 4, row, row+1);
+    ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), data.device_lb, 2, row, 2, 1);
 
     g_string_append(if_tool_str, "Device: ");
     g_string_append(if_tool_str, device.name);
@@ -754,7 +754,7 @@ capture_if_refresh_if_list(void)
         data.descr_lb = gtk_label_new("");
     }
     gtk_misc_set_alignment(GTK_MISC(data.descr_lb), 0.0f, 0.5f);
-    gtk_table_attach_defaults(GTK_TABLE(if_tb), data.descr_lb, 4, 5, row, row+1);
+    ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), data.descr_lb, 4, row, 1, 1);
     if (device.if_info.vendor_description) {
       g_string_append(if_tool_str, "Description: ");
       g_string_append(if_tool_str, device.if_info.vendor_description);
@@ -775,7 +775,7 @@ capture_if_refresh_if_list(void)
     }
     eb = gtk_event_box_new ();
     gtk_container_add(GTK_CONTAINER(eb), data.ip_lb);
-    gtk_table_attach_defaults(GTK_TABLE(if_tb), eb, 5, 6, row, row+1);
+    ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), eb, 5, row, 1, 1);
     if (get_ip_addr_count(device.if_info.addrs) > 1) {
       /* More than one IP address, make it possible to toggle */
       g_object_set_data(G_OBJECT(eb), CAPTURE_IF_IP_ADDR_LABEL, data.ip_lb);
@@ -787,17 +787,17 @@ capture_if_refresh_if_list(void)
 
     /* packets */
     data.curr_lb = gtk_label_new("-");
-    gtk_table_attach_defaults(GTK_TABLE(if_tb), data.curr_lb, 6, 7, row, row+1);
+    ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), data.curr_lb, 6, row, 1, 1);
 
     /* packets/s */
     data.last_lb = gtk_label_new("-");
-    gtk_table_attach_defaults(GTK_TABLE(if_tb), data.last_lb, 7, 8, row, row+1);
+    ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), data.last_lb, 7, row, 1, 1);
 
     /* details button */
 #ifdef _WIN32
     data.details_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_CAPTURE_DETAILS);
     gtk_widget_set_tooltip_text(data.details_bt, "Open the capture details dialog of this interface.");
-    gtk_table_attach_defaults(GTK_TABLE(if_tb), data.details_bt, 8, 9, row, row+1);
+    ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), data.details_bt, 8, row, 1, 1);
     if (capture_if_has_details(device.name)) {
       g_signal_connect(data.details_bt, "clicked", G_CALLBACK(capture_details_cb), device.name);
     } else {