projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correlation Dialog: Replace deprecated widgets
[pspp]
/
src
/
ui
/
gui
/
psppire-output-window.c
diff --git
a/src/ui/gui/psppire-output-window.c
b/src/ui/gui/psppire-output-window.c
index 695aa77eec81589a6e60319b29fff7fbe9135e47..795804a82278d60fbf8810a0135ad010a72f7f00 100644
(file)
--- a/
src/ui/gui/psppire-output-window.c
+++ b/
src/ui/gui/psppire-output-window.c
@@
-28,7
+28,6
@@
#include "libpspp/cast.h"
#include "libpspp/message.h"
#include "libpspp/string-map.h"
#include "libpspp/cast.h"
#include "libpspp/message.h"
#include "libpspp/string-map.h"
-#include "output/cairo.h"
#include "output/chart-item.h"
#include "output/driver-provider.h"
#include "output/message-item.h"
#include "output/chart-item.h"
#include "output/driver-provider.h"
#include "output/message-item.h"
@@
-353,8
+352,8
@@
psppire_output_window_export (PsppireOutputWindow *window)
GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export Output"),
GTK_WINDOW (window),
GTK_FILE_CHOOSER_ACTION_SAVE,
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);
NULL);
g_object_set (dialog, "local-only", FALSE, NULL);
@@
-474,11
+473,10
@@
psppire_output_window_export (PsppireOutputWindow *window)
static void
psppire_output_window_init (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;
window->dispose_has_run = FALSE;
@@
-502,11
+500,17
@@
psppire_output_window_init (PsppireOutputWindow *window)
NULL);
{
NULL);
{
+ GtkWidget *w;
GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
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");
PSPPIRE_WINDOW (window)->menu =
PSPPIRE_WINDOW (window)->menu =
- GTK_MENU_SHELL (gtk_
ui_manager_get_widget (uim,"/ui/menubar/windows_menuitem/windows_minimise-all")->parent
);
+ GTK_MENU_SHELL (gtk_
widget_get_parent (w)
);
}
g_signal_connect_swapped (get_action_assert (xml, "file_export"), "activate",
}
g_signal_connect_swapped (get_action_assert (xml, "file_export"), "activate",