New objects psppire-window and psppire-syntax-window.

[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 faa54a7c9dbc55e9eabafb2cfa6ceedf5f97b220..3b1db1b93a57272d4d8a37398745b7e6ba368f44 100644 (file)
--- a/src/ui/gui/weight-cases-dialog.c
+++ b/src/ui/gui/weight-cases-dialog.c
@@ -23,7 +23,7 @@
 #include "data-editor.h"
 #include "dict-display.h"
 #include <language/syntax-string-source.h>
-#include "syntax-editor.h"
+#include "psppire-syntax-window.h"
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
@@ -33,8 +33,6 @@
 #define N_(msgid) msgid
 
 
-/* FIXME: These shouldn't be here */
-#include <gtksheet/gtksheet.h>
 #include "psppire-var-store.h"
 
 static void
@@ -120,10 +118,9 @@ weight_cases_dialog (GObject *o, gpointer data)
   GtkWidget *radiobutton2 = get_widget_assert (xml, "radiobutton2");
   GtkWidget *status  = get_widget_assert (xml, "weight-status-label");
 
-  GtkSheet *var_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+  PsppireVarStore *vs = NULL;
 
-  PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+  g_object_get (de->data_editor, "var-store", &vs,  NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
 
@@ -144,7 +141,8 @@ weight_cases_dialog (GObject *o, gpointer data)
                                 source,
                                 entry,
                                 insert_source_row_into_entry,
-                                is_currently_in_entry
+                                is_currently_in_entry,
+                                NULL
                                 );
 
 
@@ -175,10 +173,11 @@ weight_cases_dialog (GObject *o, gpointer data)
       {
        gchar *syntax = generate_syntax (&wcd);
 
-       struct syntax_editor *se =
-         (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
+        GtkWidget *se = psppire_syntax_window_new ();
 
-       gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
+       gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
+
+       gtk_widget_show (se);
 
        g_free (syntax);
       }