--- np2/x11/gtk2/gtk_menu.c	2011/12/17 14:32:52	1.20
+++ np2/x11/gtk2/gtk_menu.c	2012/01/23 04:57:24	1.28
@@ -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 =
 "    <menuitem action='f12mouse'/>\n"
 "    <menuitem action='f12copy'/>\n"
 "    <menuitem action='f12stop'/>\n"
+"    <menuitem action='f12help'/>\n"
 "    <menuitem action='f12equal'/>\n"
 "    <menuitem action='f12comma'/>\n"
 "   </menu>\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);
@@ -769,6 +770,7 @@ cb_diskopen(GtkAction *action, gpointer 
 		gtk_file_filter_add_pattern(filter, "*.2[hH][dD]");
 		gtk_file_filter_add_pattern(filter, "*.[fF][dD][iI]");
 		gtk_file_filter_add_pattern(filter, "*.[fF][sS]");
+		gtk_file_filter_add_pattern(filter, "*.[fF][lL][pP]");
 		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
 	}
 	filter = gtk_file_filter_new();
@@ -785,6 +787,7 @@ cb_diskopen(GtkAction *action, gpointer 
 		gtk_file_filter_add_pattern(filter, "*.2[hH][dD]");
 		gtk_file_filter_add_pattern(filter, "*.[fF][dD][iI]");
 		gtk_file_filter_add_pattern(filter, "*.[fF][sS]");
+		gtk_file_filter_add_pattern(filter, "*.[fF][lL][pP]");
 		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
 	}
 	gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
@@ -852,7 +855,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 +941,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 +1041,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 +1186,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);
@@ -1721,7 +1722,7 @@ cb_soundboard(gint idx)
 static void
 cb_radio(GtkRadioAction *action, GtkRadioAction *current, gpointer user_data)
 {
-	guint value = (guint)gtk_radio_action_get_current_value(action);
+	gint value = gtk_radio_action_get_current_value(action);
 	guint menu_idx = (guint)GPOINTER_TO_INT(user_data);
 	gint i;