X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-assistant.c;h=c55359ef566806b5cd49adecc49d56ecbb75a268;hb=03a7b96a587a58bda342b4eb5ce5f935880ba2b7;hp=b87584de71b44b75cf71abca784aa835754beae1;hpb=464948be28a8a47f20f954b114d3762a34015d5b;p=pspp

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index b87584de71..c55359ef56 100644
--- 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"
 
@@ -86,10 +84,10 @@ init_assistant (GtkWindow *parent_window)
   g_signal_connect (a->assistant, "prepare", G_CALLBACK (on_prepare), ia);
   g_signal_connect (a->assistant, "cancel", G_CALLBACK (on_cancel), ia);
   g_signal_connect (a->assistant, "close", G_CALLBACK (on_close), ia);
-  a->paste_button = gtk_button_new_from_stock (GTK_STOCK_PASTE);
+  a->paste_button = gtk_button_new_with_label (_("Paste"));
   gtk_assistant_add_action_widget (a->assistant, a->paste_button);
   g_signal_connect (a->paste_button, "clicked", G_CALLBACK (on_paste), ia);
-  a->reset_button = gtk_button_new_from_stock ("pspp-stock-reset");
+  a->reset_button = gtk_button_new_with_label (_("Reset"));
   gtk_assistant_add_action_widget (a->assistant, a->reset_button);
   g_signal_connect (a->reset_button, "clicked", G_CALLBACK (on_reset), ia);
   gtk_window_set_title (GTK_WINDOW (a->assistant),
@@ -189,11 +187,13 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
     }
 
 
+#if GTK3_TRANSITION
   if (gtk_assistant_get_page_type (assistant, page)
       == GTK_ASSISTANT_PAGE_CONFIRM)
     gtk_widget_grab_focus (assistant->apply);
   else
     gtk_widget_grab_focus (assistant->forward);
+#endif
 }
 
 /* Called when the Cancel button in the assistant is clicked. */