X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Foneway-anova-dialog.c;h=7992b94c71c91c7637c2252fc51b1620c42e74de;hb=refs%2Fbuilds%2F20121129032043%2Fpspp;hp=0d6f5aa546694fddf4c404427d2582119f61db60;hpb=4d7bacdd25f6404e10e8e5de894e875235e43cfa;p=pspp diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c index 0d6f5aa546..7992b94c71 100644 --- a/src/ui/gui/oneway-anova-dialog.c +++ b/src/ui/gui/oneway-anova-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 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 @@ -19,9 +19,8 @@ #include #include "oneway-anova-dialog.h" #include "psppire-dict.h" -#include "psppire-var-store.h" #include "psppire-var-view.h" -#include "helper.h" +#include "builder-wrapper.h" #include "psppire-data-window.h" #include "psppire-dialog.h" #include "dialog-common.h" @@ -29,9 +28,8 @@ #include "psppire-selector.h" #include "dict-display.h" -#include #include "executor.h" - +#include "helper.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -127,8 +125,6 @@ oneway_anova_dialog (PsppireDataWindow *de) { gint response; - PsppireVarStore *vs = NULL; - struct oneway_anova_dialog ow; GtkBuilder *builder = builder_new ("oneway.ui"); @@ -157,9 +153,7 @@ oneway_anova_dialog (PsppireDataWindow *de) ow.homogeneity = GTK_TOGGLE_BUTTON (get_widget_assert (builder, "checkbutton2")); - g_object_get (de->data_editor, "var-store", &vs, NULL); - - g_object_get (vs, "dictionary", &ow.dict, NULL); + g_object_get (de->data_editor, "dictionary", &ow.dict, NULL); ow.dialog = GTK_WINDOW (get_widget_assert (builder, "oneway-anova-dialog")); @@ -211,22 +205,10 @@ oneway_anova_dialog (PsppireDataWindow *de) switch (response) { case GTK_RESPONSE_OK: - { - gchar *syntax = generate_syntax (&ow); - - struct getl_interface *sss = create_syntax_string_source (syntax); - execute_syntax (sss); - - g_free (syntax); - } + g_free (execute_syntax_string (de, generate_syntax (&ow))); break; case PSPPIRE_RESPONSE_PASTE: - { - gchar *syntax = generate_syntax (&ow); - paste_syntax_to_window (syntax); - - g_free (syntax); - } + g_free (paste_syntax_to_window (generate_syntax (&ow))); break; default: break;