X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=14df40dbebc461fe17c05a1c338ac2bc211522ca;hb=778ecd02e7e979d74f990e68ec39dbbcf2c74967;hp=fd6b7b3422f39569ed2ac30b0c450c55036c8189;hpb=ab97e700f033db654e2f44919c73973d13b0c522;p=pspp

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index fd6b7b3422..14df40dbeb 100644
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -353,8 +353,8 @@ psppire_output_window_export (PsppireOutputWindow *window)
   GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export Output"),
                                         GTK_WINDOW (window),
                                         GTK_FILE_CHOOSER_ACTION_SAVE,
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        GTK_STOCK_SAVE,   GTK_RESPONSE_ACCEPT,
+                                        _("Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("Save"),   GTK_RESPONSE_ACCEPT,
                                         NULL);
 
   g_object_set (dialog, "local-only", FALSE, NULL);
@@ -474,11 +474,10 @@ psppire_output_window_export (PsppireOutputWindow *window)
 static void
 psppire_output_window_init (PsppireOutputWindow *window)
 {
-  GtkBuilder *xml;
+  GtkBuilder *xml = builder_new ("output-window.ui");
 
-  xml = builder_new ("output-window.ui");
-
-  gtk_widget_reparent (get_widget_assert (xml, "vbox1"), GTK_WIDGET (window));
+  GtkWidget *box = get_widget_assert (xml, "box1");
+  gtk_container_add (GTK_CONTAINER (window), box);
 
   window->dispose_has_run = FALSE;
 
@@ -504,7 +503,10 @@ psppire_output_window_init (PsppireOutputWindow *window)
   {
     GtkWidget *w;
     GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
-    merge_help_menu (uim);
+
+    GtkWidget *menubar = get_widget_assert (xml, "menubar");
+
+    gtk_menu_shell_append (GTK_MENU_SHELL (menubar),  create_help_menu (GTK_WINDOW (window)));
 
     w = gtk_ui_manager_get_widget (uim,"/ui/menubar/windows_menuitem/windows_minimise-all");