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

[pspp] / src / ui / gui / page-assistant.c

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index 88314734e2d82845a82d965b3c859d3657d8d3b0..a83fbb2cd5add5204aa9e315c2336ee830f27fea 100644 (file)
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
 #include <gtk/gtk.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -46,7 +45,6 @@
 #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 "gl/error.h"
 #include "gl/intprops.h"
@@ -160,10 +158,12 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
   if ( ia->spreadsheet) 
     {
       if (pn == 0)
-      {
-      }
+       {
+         prepare_sheet_spec_page (ia);
+        }
       else if (pn == 1)
        {
+         post_sheet_spec_page (ia);
          prepare_formats_page (ia);
        }
     }
@@ -230,6 +230,8 @@ on_reset (GtkButton *button, struct import_assistant *ia)
     reset_separators_page (ia);
   else if (page == assist_get_page ((struct assist_page *) ia->formats))
     reset_formats_page (ia);
+  else if (page == assist_get_page ((struct assist_page *) ia->sheet_spec))
+    reset_sheet_spec_page (ia);
 }
 
 /* Causes the assistant to close, returning RESPONSE for