X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcrosstabs-dialog.c;h=3cb8218b91465e09dd584ccc9e2f955aa0de049b;hb=fc3f48c05a02829466ab0dc472c96be3e14259e3;hp=acac2b67494849a5ff42cb342c25a7627821fb78;hpb=c95342af39690092058967093bfa08117cdf05e7;p=pspp

diff --git a/src/ui/gui/crosstabs-dialog.c b/src/ui/gui/crosstabs-dialog.c
index acac2b6749..3cb8218b91 100644
--- a/src/ui/gui/crosstabs-dialog.c
+++ b/src/ui/gui/crosstabs-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2010, 2011  Free Software Foundation
+   Copyright (C) 2008, 2010, 2011, 2012  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
@@ -28,39 +28,39 @@
 #include <ui/gui/dict-display.h>
 #include "executor.h"
 #include <ui/gui/psppire-dialog.h>
-#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/helper.h>
+#include <ui/gui/builder-wrapper.h>
+#include "helper.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
 
-#define CROSSTABS_STATS                       \
-  CS (CHISQ, N_("Chisq"))                         \
-  CS (PHI, N_("Phi"))         \
-  CS (CC, N_("CC"))                   \
-  CS (LAMBDA, N_("Lambda"))                   \
-  CS (UC, N_("UC")) \
-  CS (BTAU, N_("BTau"))                 \
-  CS (CTAU, N_("CTau"))                 \
-  CS (RISK, N_("Risk"))  \
+#define CROSSTABS_STATS                         \
+  CS (CHISQ, N_("Chisq"))                       \
+  CS (PHI, N_("Phi"))                           \
+  CS (CC, N_("CC"))                             \
+  CS (LAMBDA, N_("Lambda"))                     \
+  CS (UC, N_("UC"))                             \
+  CS (BTAU, N_("BTau"))                         \
+  CS (CTAU, N_("CTau"))                         \
+  CS (RISK, N_("Risk"))                         \
   CS (GAMMA, N_("Gamma"))                       \
-  CS (D, N_("D"))                         \
-  CS (KAPPA, N_("Kappa"))                 \
-  CS (ETA, N_("Eta"))  \
-  CS (CORR, N_("Corr")) \
+  CS (D, N_("D"))                               \
+  CS (KAPPA, N_("Kappa"))                       \
+  CS (ETA, N_("Eta"))                           \
+  CS (CORR, N_("Corr"))                         \
   CS (STATS_NONE, N_("None"))
 
-#define CROSSTABS_CELLS \
-  CS (COUNT, N_("Count"))   \
-  CS (ROW, N_("Row"))   \
-  CS (COLUMN, N_("Column"))   \
-  CS (TOTAL, N_("Total"))   \
-  CS (EXPECTED, N_("Expected"))   \
-  CS (RESIDUAL, N_("Residual"))   \
-  CS (SRESIDUAL, N_("Std. Residual"))   \
-  CS (ASRESIDUAL, N_("Adjusted Std. Residual"))   \
+#define CROSSTABS_CELLS                         \
+  CS (COUNT, N_("Count"))                       \
+  CS (ROW, N_("Row"))                           \
+  CS (COLUMN, N_("Column"))                     \
+  CS (TOTAL, N_("Total"))                       \
+  CS (EXPECTED, N_("Expected"))                 \
+  CS (RESIDUAL, N_("Residual"))                 \
+  CS (SRESIDUAL, N_("Std. Residual"))           \
+  CS (ASRESIDUAL, N_("Adjusted Std. Residual")) \
   CS (CELLS_NONE, N_("None"))
 
 enum
@@ -349,7 +349,6 @@ crosstabs_dialog (PsppireDataWindow *de)
   struct crosstabs_dialog cd;
 
   GtkBuilder *xml = builder_new ("crosstabs.ui");
-  PsppireVarStore *vs = NULL;
   PsppireDict *dict = NULL;
 
 
@@ -365,8 +364,6 @@ crosstabs_dialog (PsppireDataWindow *de)
   cd.stat_view = get_widget_assert (xml, "stats-view");
   cd.cell_view = get_widget_assert (xml, "cell-view");
 
-  g_object_get (de->data_editor, "var-store", &vs, NULL);
-
   put_checkbox_items_in_treeview (GTK_TREE_VIEW(cd.stat_view),
 				  B_CS_STATS_DEFAULT,
 				  N_CROSSTABS_STATS,
@@ -380,12 +377,12 @@ crosstabs_dialog (PsppireDataWindow *de)
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
-  g_object_get (vs, "dictionary", &dict, NULL);
+  g_object_get (de->data_editor, "dictionary", &dict, NULL);
   g_object_set (source, "model", dict, NULL);
 
   cd.row_vars = GTK_TREE_VIEW (dest_rows);
   cd.col_vars = GTK_TREE_VIEW (dest_cols);
-  g_object_get (vs, "dictionary", &cd.dict, NULL);
+  g_object_get (de->data_editor, "dictionary", &cd.dict, NULL);
   cd.format_dialog = get_widget_assert (xml, "format-dialog");
   cd.table_button = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "print-tables"));
   cd.pivot_button = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "pivot"));