projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make psppire_sheet_get_attributes a private function
[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 5fc52e9bea1561177bc5ce33917f7e3a60584f42..106b4ad0adcdf1ae5a9bc1eea5b045b026d61434 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>
@@
-68,31
+67,27
@@
psppire_output_window_get_type (void)
};
psppire_output_window_type =
};
psppire_output_window_type =
- g_type_register_static (PSPPIRE_
WINDOW_TYPE
, "PsppireOutputWindow",
+ g_type_register_static (PSPPIRE_
TYPE_WINDOW
, "PsppireOutputWindow",
&psppire_output_window_info, 0);
}
return psppire_output_window_type;
}
&psppire_output_window_info, 0);
}
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)
{
- 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);
}
}
@@
-186,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);
@@
-237,23
+232,27
@@
psppire_output_window_init (PsppireOutputWindow *window)
window->fp = NULL;
window->fp = NULL;
- g_signal_connect (get_
widget
_assert (xml,"help_about"),
+ g_signal_connect (get_
action
_assert (xml,"help_about"),
"activate",
G_CALLBACK (about_new),
window);
"activate",
G_CALLBACK (about_new),
window);
- g_signal_connect (get_
widget
_assert (xml,"help_reference"),
+ g_signal_connect (get_
action
_assert (xml,"help_reference"),
"activate",
G_CALLBACK (reference_manual),
NULL);
"activate",
G_CALLBACK (reference_manual),
NULL);
- g_signal_connect (get_
widget
_assert (xml,"windows_minimise-all"),
+ g_signal_connect (get_
action
_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", GTK_TYPE_UI_MANAGER));
+ 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);
@@
-266,7
+265,8
@@
GtkWidget*
psppire_output_window_new (void)
{
return GTK_WIDGET (g_object_new (psppire_output_window_get_type (),
psppire_output_window_new (void)
{
return GTK_WIDGET (g_object_new (psppire_output_window_get_type (),
- "usage", PSPPIRE_WINDOW_USAGE_OUTPUT,
+ "filename", "Output",
+ "description", _("Output Viewer"),
NULL));
}
NULL));
}
@@
-298,7
+298,7
@@
reload_viewer (PsppireOutputWindow *ow)
GtkTextIter end_iter;
GtkTextMark *mark ;
GtkTextIter end_iter;
GtkTextMark *mark ;
-
static
char *line = NULL;
+ char *line = NULL;
gboolean chars_inserted = FALSE;
gboolean chars_inserted = FALSE;