X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-separators.c;h=b2e1827c16b96b6178a4855496c855995515e39d;hb=refs%2Fbuilds%2F20140228030505%2Fpspp;hp=185fa5b9a452a9556946e3938bc75c469d8baba5;hpb=b74528713f14d1fd9e852f04d2a815a3967c5a5c;p=pspp

diff --git a/src/ui/gui/page-separators.c b/src/ui/gui/page-separators.c
index 185fa5b9a4..b2e1827c16 100644
--- a/src/ui/gui/page-separators.c
+++ b/src/ui/gui/page-separators.c
@@ -22,7 +22,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
 #include <gtk/gtk.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -38,7 +37,6 @@
 #include "libpspp/i18n.h"
 #include "libpspp/line-reader.h"
 #include "libpspp/message.h"
-#include "ui/gui/checkbox-treeview.h"
 #include "ui/gui/dialog-common.h"
 #include "ui/gui/executor.h"
 #include "ui/gui/helper.h"
@@ -48,10 +46,9 @@
 #include "ui/gui/psppire-encoding-selector.h"
 #include "ui/gui/psppire-empty-list-store.h"
 #include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-var-store.h"
 #include "ui/gui/psppire-scanf.h"
+#include "ui/syntax-gen.h"
 
-#include "gl/error.h"
 #include "gl/intprops.h"
 #include "gl/xalloc.h"
 
@@ -74,7 +71,7 @@ struct separators_page
     GtkWidget *quote_combo;
     GtkEntry *quote_entry;
     GtkWidget *escape_cb;
-    GtkTreeView *fields_tree_view;
+    PsppSheetView *fields_tree_view;
   };
 
 /* The "separators" page of the assistant. */
@@ -169,7 +166,7 @@ separators_page_create (struct import_assistant *ia)
   p->escape_cb = get_widget_assert (builder, "escape");
 
   set_quote_list (GTK_COMBO_BOX_ENTRY (p->quote_combo));
-  p->fields_tree_view = GTK_TREE_VIEW (get_widget_assert (builder, "fields"));
+  p->fields_tree_view = PSPP_SHEET_VIEW (get_widget_assert (builder, "fields"));
   g_signal_connect (p->quote_combo, "changed",
                     G_CALLBACK (on_quote_combo_change), ia);
   g_signal_connect (p->quote_cb, "toggled",
@@ -591,7 +588,7 @@ on_separator_toggle (GtkToggleButton *toggle UNUSED,
 
 
 void 
-separators_append_syntax (struct import_assistant *ia, struct string *s)
+separators_append_syntax (const struct import_assistant *ia, struct string *s)
 {
   int i;
   ds_put_cstr (s, "  /DELIMITERS=\"");