From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 9 Mar 2013 12:02:14 +0000 (+0100)
Subject: Re-enabled Paste button
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad0343b259ed2d32ca3234d4e8ed6d67beb66a7b;p=pspp

Re-enabled Paste button
---

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index e10d83d0c6..dd9745cc28 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. */
diff --git a/src/ui/gui/page-formats.c b/src/ui/gui/page-formats.c
index eb863bdd12..6a2109d44a 100644
--- a/src/ui/gui/page-formats.c
+++ b/src/ui/gui/page-formats.c
@@ -198,6 +198,8 @@ prepare_formats_page (struct import_assistant *ia)
     GTK_CONTAINER (get_widget_assert (ia->asst.builder, "data-scroller")),
     ia);
 
+  gtk_widget_show (ia->asst.paste_button);
+
   pop_watch_cursor (ia);
 }