Add menushell initialiser to output viewer

diff --git a/src/ui/gui/output-viewer.glade b/src/ui/gui/output-viewer.glade
index 0bcf5f3e407d8cce0f5207d99c127ebe4136fa7c..aeb8879340d53912a36cc3efd2a9612d9866e20c 100644 (file)
--- a/src/ui/gui/output-viewer.glade
+++ b/src/ui/gui/output-viewer.glade
@@ -78,7 +78,7 @@
                 <property name="label" translatable="yes">_Windows</property>
                 <property name="use_underline">True</property>
                 <child>
-                  <widget class="GtkMenu" id="menu4">
+                  <widget class="GtkMenu" id="windows_menu">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 4905aba55911b4a07f45a010ffb5cde5b284d1c4..5fc52e9bea1561177bc5ce33917f7e3a60584f42 100644 (file)
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -252,6 +252,9 @@ psppire_output_window_init (PsppireOutputWindow *window)
                    G_CALLBACK (psppire_window_minimise_all),
                    NULL);
 
+  PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (get_widget_assert (xml,"windows_menu"));
+
+
   g_object_unref (xml);
 
   g_signal_connect (window, "delete-event",
@@ -305,9 +308,6 @@ reload_viewer (PsppireOutputWindow *ow)
 
   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