--- np2/x11/gtk2/gtk_menu.c 2011/12/17 14:32:52 1.20 +++ np2/x11/gtk2/gtk_menu.c 2011/12/17 20:34:32 1.25 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 NONAKA Kimihiro (aw9k-nnk@asahi-net.or.jp) + * Copyright (c) 2004-2011 NONAKA Kimihiro * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -241,6 +241,7 @@ static GtkRadioActionEntry f12key_entrie { "f12mouse", NULL, "F12 = _Mouse", NULL, NULL, 0 }, { "f12copy", NULL, "F12 = Co_py", NULL, NULL, 1 }, { "f12stop", NULL, "F12 = S_top", NULL, NULL, 2 }, +{ "f12help", NULL, "F12 = _Help", NULL, NULL, 7 }, { "f12equal", NULL, "F12 = tenkey [=]", NULL, NULL, 4 }, { "f12comma", NULL, "F12 = tenkey [,]", NULL, NULL, 3 }, }; @@ -416,6 +417,7 @@ static const gchar *ui_info = " \n" " \n" " \n" +" \n" " \n" " \n" " \n" @@ -577,9 +579,10 @@ cb_bmpsave(GtkAction *action, gpointer u goto end; gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE); - gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE); +#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 8 gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); +#endif if (strlen(bmpfilefolder) == 0) { g_strlcpy(bmpfilefolder, modulefile, sizeof(bmpfilefolder)); file_cutname(bmpfilefolder); @@ -656,7 +659,6 @@ cb_change_font(GtkAction *action, gpoint goto end; gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE); - gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE); utf8 = g_filename_to_utf8(np2cfg.fontfile, -1, NULL, NULL, NULL); if (utf8) { gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8); @@ -743,7 +745,6 @@ cb_diskopen(GtkAction *action, gpointer goto end; gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE); - gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE); utf8 = g_filename_to_utf8(fddfolder, -1, NULL, NULL, NULL); if (utf8) { gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8); @@ -852,7 +853,6 @@ cb_ataopen(GtkAction *action, gpointer u goto end; gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE); - gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE); utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL); if (utf8) { gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8); @@ -939,7 +939,6 @@ cb_atapiopen(GtkAction *action, gpointer goto end; gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE); - gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE); utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL); if (utf8) { gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8); @@ -1040,9 +1039,10 @@ cb_newdisk(GtkAction *action, gpointer u goto end; gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE); - gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE); +#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 8 gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); +#endif if (strlen(fddfolder) == 0) { g_strlcpy(fddfolder, modulefile, sizeof(fddfolder)); file_cutname(fddfolder); @@ -1184,7 +1184,6 @@ cb_sasiopen(GtkAction *action, gpointer goto end; gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE); - gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE); utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL); if (utf8) { gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8);