PsppireKeypad: Correct the attachment of buttons to the grid.

[pspp] / src / ui / gui / weight-cases-dialog.c

diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c
index 956451b13702fe2097a0a4f05c416a8d4201dffb..af2740abaf95f165dc429fdfaa0ef0f46e479b7b 100644 (file)
--- 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 <language/syntax-string-source.h>
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include <gtk/gtk.h>
@@ -32,8 +32,6 @@
 #define N_(msgid) msgid
 
 
-#include "psppire-var-store.h"
-
 struct weight_cases_dialog
 {
   PsppireDict *dict;
@@ -102,13 +100,12 @@ 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");
+  GtkBuilder *xml = builder_new ("weight.ui");
 
   GtkWidget *dialog = get_widget_assert (xml, "weight-cases-dialog");
   GtkWidget *source = get_widget_assert (xml, "weight-cases-treeview");
@@ -120,10 +117,7 @@ weight_cases_dialog (GObject *o, gpointer data)
 
   GtkWidget *selector = get_widget_assert (xml, "weight-cases-selector");
 
-  PsppireVarStore *vs = NULL;
-
-  g_object_get (de->data_editor, "var-store", &vs,  NULL);
-  g_object_get (vs, "dictionary", &wcd.dict, NULL);
+  g_object_get (de->data_editor, "dictionary", &wcd.dict, NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
@@ -154,20 +148,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;