Chi-square dialog: Convert from old style to psppire-dialog-action

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

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index bd66d0949972aad87404d7ffdabb39c062ef1a09..e287516f2ae22ceb9dbef2456a6758f9158e582a 100644 (file)
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -35,7 +35,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"
@@ -46,7 +45,6 @@
 #include "ui/gui/psppire-empty-list-store.h"
 #include "ui/gui/psppire-var-sheet.h"
 
-#include "gl/error.h"
 #include "gl/intprops.h"
 #include "gl/xalloc.h"
 
@@ -169,10 +167,23 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
     }
   else
     {
-      if (pn == 0)
-       prepare_separators_page (ia);
-      else if (pn == 3)
-       prepare_formats_page (ia);
+      switch (pn)
+       {
+       case 0:
+         reset_intro_page (ia);
+         break;
+       case 1:
+         reset_first_line_page (ia);
+         break;
+       case 2:
+         prepare_separators_page (ia);
+         reset_separators_page (ia);
+         break;
+       case 3:
+         prepare_formats_page (ia);
+         reset_formats_page (ia);
+         break;
+       }
     }