From 96002e4309464b3d5f7f6aacbc856eefb1e7431c Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 22 Jun 2015 21:33:19 +0200
Subject: [PATCH] Data import dialog: GtkTable -> GtkGrid

---
 src/ui/gui/page-intro.c        | 12 ++++++------
 src/ui/gui/text-data-import.ui | 22 ++++------------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/ui/gui/page-intro.c b/src/ui/gui/page-intro.c
index 5005a448b1..a7cda1b220 100644
--- a/src/ui/gui/page-intro.c
+++ b/src/ui/gui/page-intro.c
@@ -93,17 +93,17 @@ intro_page_create (struct import_assistant *ia)
 
   table  = get_widget_assert (builder, "button-table");
 
-  gtk_table_attach_defaults (GTK_TABLE (table), hbox_n_cases,
-		    1, 2,
-		    1, 2);
+  gtk_grid_attach (GTK_GRID (table), hbox_n_cases,
+		    1, 1,
+		    1, 1);
 
   p->percent_spin = gtk_spin_button_new_with_range (0, 100, 10);
 
   hbox_percent = psppire_scanf_new (_("Only the first %3d %% of file (approximately)"), &p->percent_spin);
 
-  gtk_table_attach_defaults (GTK_TABLE (table), hbox_percent,
-			     1, 2,
-			     2, 3);
+  gtk_grid_attach (GTK_GRID (table), hbox_percent,
+		   1, 2,
+		   1, 1);
 
   p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Intro"),
                                    GTK_ASSISTANT_PAGE_INTRO);
diff --git a/src/ui/gui/text-data-import.ui b/src/ui/gui/text-data-import.ui
index 1d532fb00c..526e0fb93f 100644
--- a/src/ui/gui/text-data-import.ui
+++ b/src/ui/gui/text-data-import.ui
@@ -42,10 +42,9 @@ The selected file contains N lines of text.  Only the first M of these will be s
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkTable" id="button-table">
+                      <object class="GtkGrid" id="button-table">
                         <property name="visible">True</property>
-                        <property name="n_rows">3</property>
-                        <property name="n_columns">2</property>
+			<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
                         <child>
                           <object class="GtkRadioButton" id="import-all-cases">
                             <property name="visible">True</property>
@@ -54,9 +53,6 @@ The selected file contains N lines of text.  Only the first M of these will be s
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
-                          <packing>
-                            <property name="x_options"></property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="import-n-cases">
@@ -67,11 +63,6 @@ The selected file contains N lines of text.  Only the first M of these will be s
                             <property name="draw_indicator">True</property>
                             <property name="group">import-all-cases</property>
                           </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options"></property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="import-percent">
@@ -82,11 +73,6 @@ The selected file contains N lines of text.  Only the first M of these will be s
                             <property name="draw_indicator">True</property>
                             <property name="group">import-all-cases</property>
                           </object>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options"></property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label1">
@@ -95,8 +81,8 @@ The selected file contains N lines of text.  Only the first M of these will be s
                             <property name="label" translatable="yes">All cases</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
+			    <property name="left-attach">1</property>
+			    <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
-- 
2.30.2