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 1bb7a455780245d50c1b25a39cab7e76823e9b8b..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>
@@
-75,26
+74,20
@@
psppire_output_window_get_type (void)
return psppire_output_window_type;
}
return psppire_output_window_type;
}
+static GObjectClass *parent_class;
static void
psppire_output_window_finalize (GObject *object)
{
static void
psppire_output_window_finalize (GObject *object)
{
- g_debug ("%s %p", __FUNCTION__, object);
-
- GObjectClass *class = G_OBJECT_GET_CLASS (object);
-
- GObjectClass *parent_class = g_type_class_peek_parent (class);
-
-
if (G_OBJECT_CLASS (parent_class)->finalize)
(*G_OBJECT_CLASS (parent_class)->finalize) (object);
if (G_OBJECT_CLASS (parent_class)->finalize)
(*G_OBJECT_CLASS (parent_class)->finalize) (object);
-
}
static void
psppire_output_window_class_init (PsppireOutputWindowClass *class)
{
}
static void
psppire_output_window_class_init (PsppireOutputWindowClass *class)
{
+ parent_class = g_type_class_peek_parent (class);
}
}
@@
-188,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);
@@
-239,21
+232,26
@@
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);
+ 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_signal_connect (window, "delete-event",
g_object_unref (xml);
g_signal_connect (window, "delete-event",
@@
-266,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));
}
@@
-283,7
+282,7
@@
psppire_output_window_reload (void)
if ( NULL == the_output_viewer )
{
the_output_viewer = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ());
if ( NULL == the_output_viewer )
{
the_output_viewer = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ());
- gtk_widget_show (
the_output_viewer
);
+ gtk_widget_show (
GTK_WIDGET (the_output_viewer)
);
}
reload_viewer (the_output_viewer);
}
reload_viewer (the_output_viewer);
@@
-307,9
+306,6
@@
reload_viewer (PsppireOutputWindow *ow)
mark = gtk_text_buffer_create_mark (ow->buffer, NULL, &end_iter, TRUE);
mark = gtk_text_buffer_create_mark (ow->buffer, NULL, &end_iter, TRUE);
-
- g_debug ("%s %p\n", __FUNCTION__, ow);
-
#ifdef __CYGWIN__
/*
Apparently Windoze is not capabale of writing to a file whilst
#ifdef __CYGWIN__
/*
Apparently Windoze is not capabale of writing to a file whilst