Missing Values Dialog: replace deprecated widgets

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

diff --git a/src/ui/gui/psppire-dialog-action-descriptives.c b/src/ui/gui/psppire-dialog-action-descriptives.c
index b83cea8067f7cc6bbda9369ac4483985f4dfd049..9140e19c3c21100f6e86863b5e3a445909cbe5bf 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-descriptives.c
+++ b/src/ui/gui/psppire-dialog-action-descriptives.c
@@ -19,7 +19,7 @@
 
 #include "psppire-dialog-action-descriptives.h"
 
-#include "checkbox-treeview.h"
+#include "psppire-checkbox-treeview.h"
 
 #include "psppire-var-view.h"
 #include "psppire-dict.h"
@@ -192,26 +192,33 @@ dialog_refresh (PsppireDialogAction *scd_)
   gtk_toggle_button_set_active (scd->save_z_scores, false);
 }
 
+
 static void
 psppire_dialog_action_descriptives_activate (GtkAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionDescriptives *act = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (a);
 
-  GtkBuilder *xml = builder_new ("descriptives.ui");
+  GHashTable *thing = psppire_dialog_action_get_pointer (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");
 
   pda->dialog = get_widget_assert   (xml, "descriptives-dialog");
   pda->source = get_widget_assert   (xml, "all-variables");
   act->variables =   get_widget_assert   (xml, "stat-variables");
 
-  g_object_set (pda->source, "model", pda->dict,
-       "predicate", var_is_numeric, NULL);
+  g_object_set (pda->source,
+               "predicate", var_is_numeric, NULL);
 
-  put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
-                                 B_DS_DEFAULT,
-                                 N_DESCRIPTIVE_STATS, stats);
+  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));
@@ -227,14 +234,12 @@ psppire_dialog_action_descriptives_activate (GtkAction *a)
   psppire_dialog_action_set_refresh (pda, dialog_refresh);
 
   PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_descriptives_parent_class)->activate (pda);
-
-  g_object_unref (xml);
 }
 
 static void
 psppire_dialog_action_descriptives_class_init (PsppireDialogActionDescriptivesClass *class)
 {
-  GTK_ACTION_CLASS (class)->activate = psppire_dialog_action_descriptives_activate;
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_descriptives_activate);
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }