Merge remote branch 'origin/master' into import-gui

[pspp] / src / ui / gui / page-first-line.c

diff --git a/src/ui/gui/page-first-line.c b/src/ui/gui/page-first-line.c
index d1cec2cb4ee83d77eb009890cfe7e4cf40fcf381..d3191e78cac89ed60f1c9680c0c16cdfd2a3a768 100644 (file)
--- a/src/ui/gui/page-first-line.c
+++ b/src/ui/gui/page-first-line.c
@@ -50,7 +50,6 @@
 #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"
@@ -89,10 +88,9 @@ first_line_page_create (struct import_assistant *ia)
 
   GtkBuilder *builder = ia->asst.builder;
 
-#if 0
   p->page = add_page_to_assistant (ia, get_widget_assert (builder, "FirstLine"),
                                    GTK_ASSISTANT_PAGE_CONTENT);
-#endif
+
   gtk_widget_destroy (get_widget_assert (builder, "first-line"));
   p->tree_view = create_lines_tree_view (
     GTK_CONTAINER (get_widget_assert (builder, "first-line-scroller")), ia);
@@ -235,3 +233,12 @@ get_first_line (struct import_assistant *ia)
   gtk_widget_set_sensitive (ia->first_line->variable_names_cb,
                             ia->skip_lines > 0);
 }
+
+
+
+void
+first_line_append_syntax (const struct import_assistant *ia, struct string *s)
+{
+  if (ia->skip_lines > 0)
+    ds_put_format (s, "  /FIRSTCASE=%d\n", ia->skip_lines + 1);
+}