X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fpage-assistant.c;h=f1a965d5684b41fb5a3250cbf67442bb37e35e73;hb=ea7ab5022ca3c4c2ddd9e544c8dce9783461e2a7;hp=e10d83d0c6a817d57c24bca512d15363b35f8fc0;hpb=c0f256a4ff6d51ab0ce34c30fc12681686a41033;p=pspp

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index e10d83d0c6..f1a965d568 100644
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -154,6 +154,9 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
 {
   int pn = gtk_assistant_get_current_page (assistant);
 
+  gtk_widget_show (ia->asst.reset_button);
+  gtk_widget_hide (ia->asst.paste_button);
+
   if ( ia->spreadsheet) 
     {
       if (pn == 0)
@@ -178,14 +181,6 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
     gtk_widget_grab_focus (assistant->apply);
   else
     gtk_widget_grab_focus (assistant->forward);
-
-#if 0
-  gtk_widget_show (ia->asst.reset_button);
-  if (page == ia->formats->page)
-    gtk_widget_show (ia->asst.paste_button);
-  else
-    gtk_widget_hide (ia->asst.paste_button);
-#endif
 }
 
 /* Called when the Cancel button in the assistant is clicked. */
@@ -211,25 +206,32 @@ on_paste (GtkButton *button, struct import_assistant *ia)
   close_assistant (ia, PSPPIRE_RESPONSE_PASTE);
 }
 
+static GtkWidget *
+assist_get_page (struct assist_page *ap)
+{
+  if (ap == NULL)
+    return NULL;
+
+  return ap->page;
+}
+
 /* Called when the Reset button is clicked. */
 static void
 on_reset (GtkButton *button, struct import_assistant *ia)
 {
-#if 0
   gint page_num = gtk_assistant_get_current_page (ia->asst.assistant);
   GtkWidget *page = gtk_assistant_get_nth_page (ia->asst.assistant, page_num);
 
-  if (page == ia->intro->page)
+  if (page == assist_get_page ((struct assist_page *) ia->intro))
     reset_intro_page (ia);
-  else if (page == ia->first_line->page)
+  else if (page == assist_get_page ((struct assist_page *) ia->first_line))
     reset_first_line_page (ia);
-  else if (page == ia->separators->page)
+  else if (page == assist_get_page ((struct assist_page *) ia->separators))
     reset_separators_page (ia);
-  else if (page == ia->formats->page)
+  else if (page == assist_get_page ((struct assist_page *) ia->formats))
     reset_formats_page (ia);
-  else if (page == ia->sheet_spec->page)
+  else if (page == assist_get_page ((struct assist_page *) ia->sheet_spec))
     reset_sheet_spec_page (ia);
-#endif
 }
 
 /* Causes the assistant to close, returning RESPONSE for