Merge "master" into "psppsheet" to obtain bug fixes from "master".

[pspp] / src / ui / gui / binomial-dialog.c

diff --git a/src/ui/gui/binomial-dialog.c b/src/ui/gui/binomial-dialog.c
index 256b32528b774bafc3153fe359976fc4ea6343e3..90d9118ea6e29ea5c593cfc2d6438548974ebaaf 100644 (file)
--- a/src/ui/gui/binomial-dialog.c
+++ b/src/ui/gui/binomial-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2010  Free Software Foundation
+   Copyright (C) 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
@@ -23,9 +23,9 @@
 #include "psppire-acr.h"
 #include "dialog-common.h"
 
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "executor.h"
-
+#include "helper.h"
 
 #include <gtk/gtk.h>
 
@@ -146,7 +146,6 @@ binomial_dialog (PsppireDataWindow *dw)
   struct binomial_dialog bin_d;
 
   GtkBuilder *xml = builder_new ("binomial.ui");
-  PsppireVarStore *vs;
 
   GtkWidget *dialog = get_widget_assert   (xml, "binomial-dialog");
 
@@ -154,8 +153,6 @@ binomial_dialog (PsppireDataWindow *dw)
 
   GtkWidget *dict_view = get_widget_assert   (xml, "dict-view");
 
-  g_object_get (dw->data_editor, "var-store", &vs, NULL);
-
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (dw));
 
   bin_d.var_view  = get_widget_assert (xml, "variables-treeview");
@@ -165,7 +162,7 @@ binomial_dialog (PsppireDataWindow *dw)
   bin_d.cutpoint_entry =     get_widget_assert   (xml, "cutpoint-entry");
   bin_d.cutpoint_button =    get_widget_assert   (xml, "radiobutton4");
 
-  g_object_get (vs, "dictionary", &bin_d.dict, NULL);
+  g_object_get (dw->data_editor, "dictionary", &bin_d.dict, NULL);
   g_object_set (dict_view,
                "model", bin_d.dict, 
                "predicate", var_is_numeric,
@@ -185,7 +182,7 @@ binomial_dialog (PsppireDataWindow *dw)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      g_free (execute_syntax_string (generate_syntax (&bin_d)));
+      g_free (execute_syntax_string (dw, generate_syntax (&bin_d)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
       g_free (paste_syntax_to_window (generate_syntax (&bin_d)));