From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 19 Jul 2015 11:13:18 +0000 (+0200)
Subject: PsppireDialogActionIndepSamples: Replace GtkTable with GtkGrid
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=792c0643390717bf4ca02b719228434253019549;p=pspp

PsppireDialogActionIndepSamples: Replace GtkTable with GtkGrid
---

diff --git a/src/ui/gui/indep-samples.ui b/src/ui/gui/indep-samples.ui
index 3266ec3a86..a07d65720b 100644
--- a/src/ui/gui/indep-samples.ui
+++ b/src/ui/gui/indep-samples.ui
@@ -15,17 +15,12 @@
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkTable" id="table1">
+          <object class="GtkGrid" id="table1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="n_rows">3</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
-            <child>
-              <placeholder/>
-            </child>
+            <property name="column_spacing">5</property>
             <child>
               <object class="GtkRadioButton" id="radiobutton3">
                 <property name="visible">True</property>
@@ -37,7 +32,8 @@
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
-                <property name="x_options"/>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -116,10 +112,7 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_EXPAND</property>
               </packing>
             </child>
             <child>
@@ -164,11 +157,7 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="y_options"/>
-                <property name="y_padding">5</property>
               </packing>
             </child>
             <child>
@@ -183,8 +172,7 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options"/>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -199,12 +187,13 @@
                 <property name="group">radiobutton3</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options"/>
-                <property name="y_options"/>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
diff --git a/src/ui/gui/psppire-dialog-action-indep-samps.c b/src/ui/gui/psppire-dialog-action-indep-samps.c
index df38051149..f91c03aa9c 100644
--- a/src/ui/gui/psppire-dialog-action-indep-samps.c
+++ b/src/ui/gui/psppire-dialog-action-indep-samps.c
@@ -162,8 +162,8 @@ run_define_groups (PsppireDialogActionIndepSamps *act)
 
   if ( var_is_numeric (act->grp_var))
     {
-      gtk_table_attach_defaults (GTK_TABLE (act->dg_table1), act->dg_table2,
-  				 1, 2, 1, 2);
+      gtk_grid_attach (GTK_GRID (act->dg_table1), act->dg_table2,
+		       1, 1, 1, 1);
 
       gtk_container_add (GTK_CONTAINER (act->dg_box), act->dg_table1);
     }