X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fwindows-menu.c;h=b6ae962b62ac89392d5060616a4cd76235826796;hb=b525a9596e60d5ae4c6c464b4a426b77ade3dd72;hp=e4c6fa370fd346f7cfac92b9828dd0a179b0f8a5;hpb=4afc697af0b98afcb52e0384be90f893d6710893;p=pspp diff --git a/src/ui/gui/windows-menu.c b/src/ui/gui/windows-menu.c index e4c6fa370f..b6ae962b62 100644 --- a/src/ui/gui/windows-menu.c +++ b/src/ui/gui/windows-menu.c @@ -47,7 +47,7 @@ reset_check_state (GtkWidget *widget, gpointer ud) if (state == TRUE) gtk_window_present (win); - + /* Prevent the state from actually changing */ g_signal_handlers_block_by_func (widget, reset_check_state, ud); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), !state); @@ -90,30 +90,29 @@ repopulate_windows_menu (GObject *inst, gchar *name, gpointer data) GtkWindow *toplevel = g_object_get_data (G_OBJECT (mi), "toplevel"); GtkWidget *minimize = gtk_menu_item_new_with_mnemonic (_("_Minimize all Windows")); - GtkWidget *split = gtk_check_menu_item_new_with_mnemonic (_("_Split")); - GtkWidget *sep = gtk_separator_menu_item_new (); - + gtk_menu_attach (GTK_MENU (menu), minimize, 0, 1, 0, 1); - if (PSPPIRE_DATA_WINDOW_TYPE == G_OBJECT_TYPE (toplevel) ) + if (PSPPIRE_DATA_WINDOW_TYPE == G_OBJECT_TYPE (toplevel)) { + GtkWidget *split = gtk_check_menu_item_new_with_mnemonic (_("_Split")); gtk_menu_attach (GTK_MENU (menu), split, 0, 1, 1, 2); g_signal_connect_swapped (split, "toggled", G_CALLBACK (toggle_split_window), toplevel); } - + gtk_container_add (GTK_CONTAINER (menu), sep); gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), menu); g_object_set_data (G_OBJECT (menu), "toplevel", toplevel); - + g_hash_table_foreach (reg->name_table, add_menuitem, menu); g_signal_connect (minimize, "activate", G_CALLBACK (min_all), NULL); - + gtk_widget_show_all (GTK_WIDGET (mi)); } @@ -129,11 +128,11 @@ GtkWidget * create_windows_menu (GtkWindow *toplevel) { PsppireWindowRegister *reg = psppire_window_register_new (); - + GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (_("_Windows")); g_object_set_data (G_OBJECT (menuitem), "toplevel", toplevel); - + g_signal_connect (reg, "removed", G_CALLBACK (repopulate_windows_menu), menuitem); g_signal_connect (reg, "inserted", G_CALLBACK (repopulate_windows_menu), menuitem);