X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=f8758a0cd7e2e6a5a2b1b7dbbc6724677b9f289b;hb=0cd7c010e3e5c316ef0eb0317fb7f408d164679d;hp=8790778a065de86ea1589d423e03380ccae277a7;hpb=e17bf22963466952e4333a9f9994ebad4ca2f5e8;p=pspp diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 8790778a06..f8758a0cd7 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -36,8 +36,8 @@ #include "ui/gui/psppire-encoding-selector.h" #include "ui/gui/psppire-lex-reader.h" #include "ui/gui/psppire-syntax-window.h" -#include "ui/gui/psppire-window-register.h" #include "ui/gui/psppire.h" +#include "ui/gui/windows-menu.h" #include "gl/localcharset.h" #include "gl/xalloc.h" @@ -859,22 +859,11 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) G_CALLBACK (on_run_to_end), window); - g_signal_connect (get_action_assert (xml,"windows_minimise_all"), - "activate", - G_CALLBACK (psppire_window_minimise_all), NULL); - - - - - - { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); - GtkWidget *w = gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all"); - - merge_help_menu (uim); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), + create_windows_menu (GTK_WINDOW (window))); - PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (gtk_widget_get_parent (w)); - } + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), + create_help_menu (GTK_WINDOW (window))); g_object_unref (xml); }