--- np2/x11/gtk2/gtk_menu.c	2007/01/24 14:09:32	1.9
+++ np2/x11/gtk2/gtk_menu.c	2007/08/22 15:20:31	1.11
@@ -1,4 +1,4 @@
-/*	$Id: gtk_menu.c,v 1.9 2007/01/24 14:09:32 monaka Exp $	*/
+/*	$Id: gtk_menu.c,v 1.11 2007/08/22 15:20:31 monaka Exp $	*/
 
 /*
  * Copyright (c) 2004 NONAKA Kimihiro (aw9k-nnk@asahi-net.or.jp)
@@ -357,6 +357,7 @@ static const gchar *ui_info =
 "   <menuitem action='1/2 frame'/>\n"
 "   <menuitem action='1/3 frame'/>\n"
 "   <menuitem action='1/4 frame'/>\n"
+#if defined(SUPPORT_SCREENSIZE)
 "   <separator/>\n"
 "   <menu name='Size' action='ScrnSizeMenu'>\n"
 "    <menuitem action='320x200'/>\n"
@@ -366,6 +367,7 @@ static const gchar *ui_info =
 "    <menuitem action='960x600'/>\n"
 "    <menuitem action='1280x800'/>\n"
 "   </menu>\n"
+#endif
 "   <separator/>\n"
 "   <menuitem action='screenopt'/>\n"
 "  </menu>\n"
@@ -547,9 +549,13 @@ cb_bmpsave(GtkAction *action, gpointer u
 
 	g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
 	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+	if (strlen(bmpfilefolder) == 0) {
+		g_strlcpy(bmpfilefolder, modulefile, sizeof(bmpfilefolder));
+		file_cutname(bmpfilefolder);
+	}
 	utf8 = g_filename_to_utf8(bmpfilefolder, -1, NULL, NULL, NULL);
 	if (utf8) {
-		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), utf8);
+		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8);
 		g_free(utf8);
 	}
 
@@ -834,6 +840,8 @@ cb_ataopen(GtkAction *action, gpointer u
 	filter = gtk_file_filter_new();
 	if (filter) {
 		gtk_file_filter_set_name(filter, "IDE disk image files");
+		gtk_file_filter_add_pattern(filter, "*.[tT][hH][dD]");
+		gtk_file_filter_add_pattern(filter, "*.[hH][dD][iI]");
 		gtk_file_filter_add_pattern(filter, "*.[nN][hH][dD]");
 		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
 	}
@@ -1019,6 +1027,10 @@ cb_newdisk(GtkAction *action, gpointer u
 
 	g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
 	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+	if (strlen(fddfolder) == 0) {
+		g_strlcpy(fddfolder, modulefile, sizeof(fddfolder));
+		file_cutname(fddfolder);
+	}
 	utf8 = g_filename_to_utf8(fddfolder, -1, NULL, NULL, NULL);
 	if (utf8) {
 		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), utf8);