X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fweight-cases-dialog.c;h=c19eda0d06974c3c7ea0d18adeb149fbbacf8ae7;hb=858cab0d05698bc5033b678a5865839ee5d73091;hp=956451b13702fe2097a0a4f05c416a8d4201dffb;hpb=3b296fce73d5446b67c13c3b56d74ab0b38519d9;p=pspp diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c index 956451b137..c19eda0d06 100644 --- a/src/ui/gui/weight-cases-dialog.c +++ b/src/ui/gui/weight-cases-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 @@ -22,7 +22,7 @@ #include "executor.h" #include "psppire-data-window.h" #include "dict-display.h" -#include +#include "builder-wrapper.h" #include "helper.h" #include @@ -102,10 +102,9 @@ static gchar * generate_syntax (const struct weight_cases_dialog *wcd); /* Pops up the Weight Cases dialog box */ void -weight_cases_dialog (GObject *o, gpointer data) +weight_cases_dialog (PsppireDataWindow *de) { gint response; - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); struct weight_cases_dialog wcd; GtkBuilder *xml = builder_new ("psppire.ui"); @@ -154,20 +153,10 @@ weight_cases_dialog (GObject *o, gpointer data) switch (response) { case GTK_RESPONSE_OK: - { - gchar *syntax = generate_syntax (&wcd); - struct getl_interface *sss = create_syntax_string_source (syntax); - execute_syntax (sss); - - g_free (syntax); - } + g_free (execute_syntax_string (de, generate_syntax (&wcd))); break; case PSPPIRE_RESPONSE_PASTE: - { - gchar *syntax = generate_syntax (&wcd); - paste_syntax_in_new_window (syntax); - g_free (syntax); - } + g_free (paste_syntax_to_window (generate_syntax (&wcd))); break; default: break;