X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-crosstabs.c;h=f6883a88041924f2835bc78bb7c60ee277557311;hb=7f5b644c341869cb2e58dbaec4da7df57b39c8ab;hp=2bc07c6e4c75a4c9554a90e35e3374deb511dd75;hpb=f548196d5cc509d19ba0f7c67da513e9dd4f996d;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-crosstabs.c b/src/ui/gui/psppire-dialog-action-crosstabs.c
index 2bc07c6e4c..f6883a8804 100644
--- a/src/ui/gui/psppire-dialog-action-crosstabs.c
+++ b/src/ui/gui/psppire-dialog-action-crosstabs.c
@@ -27,7 +27,7 @@
 
 #include "psppire-dialog.h"
 #include "builder-wrapper.h"
-#include "checkbox-treeview.h"
+#include "psppire-checkbox-treeview.h"
 #include "psppire-dict.h"
 #include "libpspp/str.h"
 
@@ -208,7 +208,13 @@ psppire_dialog_action_crosstabs_activate (GtkAction *a)
   PsppireDialogActionCrosstabs *act = PSPPIRE_DIALOG_ACTION_CROSSTABS (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
 
-  GtkBuilder *xml = builder_new ("crosstabs.ui");
+  GHashTable *thing = psppire_dialog_action_get_pointer (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("crosstabs.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
 
   pda->dialog = get_widget_assert   (xml, "crosstabs-dialog");
   pda->source = get_widget_assert   (xml, "dict-treeview");
@@ -228,26 +234,21 @@ psppire_dialog_action_crosstabs_activate (GtkAction *a)
   act->table_button = get_widget_assert (xml, "print-tables");
   act->pivot_button = get_widget_assert (xml, "pivot");
 
-
-  g_object_unref (xml);
-
   act->format_options_avalue = TRUE;
   act->format_options_table = TRUE;
   act->format_options_pivot = TRUE;
 
-  put_checkbox_items_in_treeview (GTK_TREE_VIEW (act->cell_view),
-				  B_CS_CELL_DEFAULT,
-				  N_CROSSTABS_CELLS,
-				  cells
-				  );
+  psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->cell_view),
+  				  B_CS_CELL_DEFAULT,
+  				  N_CROSSTABS_CELLS,
+  				  cells);
 
   act->cell = gtk_tree_view_get_model (GTK_TREE_VIEW (act->cell_view));
 
-  put_checkbox_items_in_treeview (GTK_TREE_VIEW (act->stat_view),
-				  B_CS_STATS_DEFAULT,
-				  N_CROSSTABS_STATS,
-				  stats
-				  );
+  psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
+  				  B_CS_STATS_DEFAULT,
+  				  N_CROSSTABS_STATS,
+  				  stats);
 
   act->stat = gtk_tree_view_get_model (GTK_TREE_VIEW (act->stat_view));
 
@@ -380,10 +381,7 @@ generate_syntax (PsppireDialogAction *a)
 static void
 psppire_dialog_action_crosstabs_class_init (PsppireDialogActionCrosstabsClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_crosstabs_activate;
-
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_crosstabs_activate);
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }