X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-descriptives.c;h=325596307ee32c07870837f7842fff0febccaf6a;hb=487ffe246e97caf4c0bc8d40b554f2e158982cec;hp=9140e19c3c21100f6e86863b5e3a445909cbe5bf;hpb=fc6620099bbc53762095569d5356b67a81a85402;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-descriptives.c b/src/ui/gui/psppire-dialog-action-descriptives.c
index 9140e19c3c..325596307e 100644
--- a/src/ui/gui/psppire-dialog-action-descriptives.c
+++ b/src/ui/gui/psppire-dialog-action-descriptives.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2012  Free Software Foundation
+   Copyright (C) 2015  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@ static const struct checkbox_entry_item stats[] =
 
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionDescriptives *scd = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (act);
   gchar *text;
@@ -194,20 +194,24 @@ dialog_refresh (PsppireDialogAction *scd_)
 
 
 static void
-psppire_dialog_action_descriptives_activate (GtkAction *a)
+psppire_dialog_action_descriptives_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionDescriptives *act = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (a);
 
-  GHashTable *thing = psppire_dialog_action_get_pointer (pda);
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
   GtkBuilder *xml = g_hash_table_lookup (thing, a);
   if (!xml)
     {
       xml = builder_new ("descriptives.ui");
       g_hash_table_insert (thing, a, xml);
-    }
 
-  GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
+      GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
+      psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (stats_treeview),
+					  B_DS_DEFAULT,
+					  N_DESCRIPTIVE_STATS, stats);
+      act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
+    }
 
   pda->dialog = get_widget_assert   (xml, "descriptives-dialog");
   pda->source = get_widget_assert   (xml, "all-variables");
@@ -216,12 +220,7 @@ psppire_dialog_action_descriptives_activate (GtkAction *a)
   g_object_set (pda->source,
 		"predicate", var_is_numeric, NULL);
 
-  psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (stats_treeview),
-				      B_DS_DEFAULT,
-				      N_DESCRIPTIVE_STATS, stats);
-
   act->stat_vars = GTK_TREE_VIEW (act->variables);
-  act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
   
   act->include_user_missing =
     GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
@@ -232,8 +231,6 @@ psppire_dialog_action_descriptives_activate (GtkAction *a)
 
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, dialog_refresh);
-
-  PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_descriptives_parent_class)->activate (pda);
 }
 
 static void