PsppireDialogAction (generate_syntax): Change signature.

[pspp] / src / ui / gui / psppire-dialog-action-indep-samps.c

diff --git a/src/ui/gui/psppire-dialog-action-indep-samps.c b/src/ui/gui/psppire-dialog-action-indep-samps.c
index 72e57731b93703ca90108566539e1bdbcb1e4e0d..1d647092b5d55f0b0753628b8e76d2b77fec94da 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-indep-samps.c
+++ b/src/ui/gui/psppire-dialog-action-indep-samps.c
@@ -151,18 +151,19 @@ run_define_groups (PsppireDialogActionIndepSamps *act)
 {
   gint response;
   PsppireDialogAction *da = PSPPIRE_DIALOG_ACTION (act);
+  GtkWidget *parent1 = gtk_widget_get_parent (act->dg_table1);
+  GtkWidget *parent2 = gtk_widget_get_parent (act->dg_table2);
 
-  if ( act->dg_table2->parent)
-    gtk_container_remove (GTK_CONTAINER (act->dg_table2->parent), act->dg_table2);
-
-  if ( act->dg_table1->parent)
-    gtk_container_remove (GTK_CONTAINER (act->dg_table1->parent), act->dg_table1);
+  if (parent1)
+    gtk_container_remove (GTK_CONTAINER (parent1), act->dg_table1);
 
+  if (parent2)
+    gtk_container_remove (GTK_CONTAINER (parent2), act->dg_table2);
 
   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);
     }
@@ -286,12 +287,18 @@ set_group_criterion_type (GtkToggleButton *button,
 
 
 static void
-psppire_dialog_action_indep_samps_activate (GtkAction *a)
+psppire_dialog_action_indep_samps_activate (PsppireDialogAction *a)
 {
   PsppireDialogActionIndepSamps *act = PSPPIRE_DIALOG_ACTION_INDEP_SAMPS (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
 
-  GtkBuilder *xml = builder_new ("indep-samples.ui");
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("indep-samples.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
 
   pda->dialog = get_widget_assert (xml,"independent-samples-dialog"); 
   pda->source = get_widget_assert (xml, "indep-samples-treeview1");
@@ -323,9 +330,6 @@ psppire_dialog_action_indep_samps_activate (GtkAction *a)
   g_signal_connect (act->dg_values_toggle_button, "toggled",
                    G_CALLBACK (set_group_criterion_type), act);
 
-
-  g_object_unref (xml);
-
   psppire_dialog_action_set_refresh (pda, refresh);
 
   psppire_dialog_action_set_valid_predicate (pda,
@@ -348,7 +352,7 @@ psppire_dialog_action_indep_samps_activate (GtkAction *a)
 
 
 static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (const PsppireDialogAction *a)
 {
   PsppireDialogActionIndepSamps *act = PSPPIRE_DIALOG_ACTION_INDEP_SAMPS (a);
   gchar *text;
@@ -413,9 +417,7 @@ generate_syntax (PsppireDialogAction *a)
 static void
 psppire_dialog_action_indep_samps_class_init (PsppireDialogActionIndepSampsClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_indep_samps_activate;
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_indep_samps_activate);
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }