projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re enable the connect_help function
[pspp-builds.git]
/
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 89075424e0c6a1465098e68f41009cff05ba9147..3671e098c0ea9d1156bcff13559cffb47497b5c8 100644
(file)
--- a/
src/ui/gui/psppire-output-window.c
+++ b/
src/ui/gui/psppire-output-window.c
@@
-18,7
+18,6
@@
#include <gtk/gtksignal.h>
#include <gtk/gtkbox.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkbox.h>
-#include <glade/glade.h>
#include "helper.h"
#include <libpspp/message.h>
#include "helper.h"
#include <libpspp/message.h>
@@
-182,7
+181,7
@@
on_textview_resize (GtkWidget *widget,
static void
psppire_output_window_init (PsppireOutputWindow *window)
{
static void
psppire_output_window_init (PsppireOutputWindow *window)
{
- G
ladeXML *xml = XML_NEW ("output-viewer.glade
");
+ G
tkBuilder *xml = builder_new ("output-viewer.ui
");
GtkWidget *box = gtk_vbox_new (FALSE, 0);
GtkWidget *box = gtk_vbox_new (FALSE, 0);
@@
-233,23
+232,25
@@
psppire_output_window_init (PsppireOutputWindow *window)
window->fp = NULL;
window->fp = NULL;
- g_signal_connect (get_
widge
t_assert (xml,"help_about"),
+ g_signal_connect (get_
objec
t_assert (xml,"help_about"),
"activate",
G_CALLBACK (about_new),
window);
"activate",
G_CALLBACK (about_new),
window);
- g_signal_connect (get_
widge
t_assert (xml,"help_reference"),
+ g_signal_connect (get_
objec
t_assert (xml,"help_reference"),
"activate",
G_CALLBACK (reference_manual),
NULL);
"activate",
G_CALLBACK (reference_manual),
NULL);
- g_signal_connect (get_
widge
t_assert (xml,"windows_minimise-all"),
+ g_signal_connect (get_
objec
t_assert (xml,"windows_minimise-all"),
"activate",
G_CALLBACK (psppire_window_minimise_all),
NULL);
"activate",
G_CALLBACK (psppire_window_minimise_all),
NULL);
-
PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (get_widget_assert (xml,"windows_menu
"));
+
GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1
"));
+ PSPPIRE_WINDOW (window)->menu =
+ GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar1/windows_menuitem/windows_minimise-all")->parent);
g_object_unref (xml);
g_object_unref (xml);
@@
-263,6
+264,7
@@
psppire_output_window_new (void)
{
return GTK_WIDGET (g_object_new (psppire_output_window_get_type (),
"usage", PSPPIRE_WINDOW_USAGE_OUTPUT,
{
return GTK_WIDGET (g_object_new (psppire_output_window_get_type (),
"usage", PSPPIRE_WINDOW_USAGE_OUTPUT,
+ "filename", "Output",
NULL));
}
NULL));
}