--- np2/x11/gtk2/gtk_menu.c	2008/03/18 15:03:48	1.13
+++ np2/x11/gtk2/gtk_menu.c	2010/08/16 14:26:55	1.16
@@ -1,4 +1,4 @@
-/*	$Id: gtk_menu.c,v 1.13 2008/03/18 15:03:48 monaka Exp $	*/
+/*	$Id: gtk_menu.c,v 1.16 2010/08/16 14:26:55 monaka Exp $	*/
 
 /*
  * Copyright (c) 2004 NONAKA Kimihiro (aw9k-nnk@asahi-net.or.jp)
@@ -1078,7 +1078,7 @@ cb_newdisk(GtkAction *action, gpointer u
 
 	filter[0] = gtk_file_filter_new();
 	if (filter[0]) {
-		gtk_file_filter_set_name(filter[0], "D88 floppy disk image");
+		gtk_file_filter_set_name(filter[0], "D88 floppy disk image (*.d88,*.d98,*.88d,*.98d)");
 		gtk_file_filter_add_pattern(filter[0], "*.[dD]88");
 		gtk_file_filter_add_pattern(filter[0], "*.88[dD]");
 		gtk_file_filter_add_pattern(filter[0], "*.[dD]98");
@@ -1087,19 +1087,19 @@ cb_newdisk(GtkAction *action, gpointer u
 	}
 	filter[1] = gtk_file_filter_new();
 	if (filter[1]) {
-		gtk_file_filter_set_name(filter[1], "Anex86 hard disk image files");
+		gtk_file_filter_set_name(filter[1], "Anex86 hard disk image (*.hdi)");
 		gtk_file_filter_add_pattern(filter[1], "*.[hH][dD][iI]");
 		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[1]);
 	}
 	filter[2] = gtk_file_filter_new();
 	if (filter[2]) {
-		gtk_file_filter_set_name(filter[2], "T98 hard disk image files");
+		gtk_file_filter_set_name(filter[2], "T98 hard disk image (*.thd)");
 		gtk_file_filter_add_pattern(filter[2], "*.[tT][hH][dD]");
 		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[2]);
 	}
 	filter[3] = gtk_file_filter_new();
 	if (filter[3]) {
-		gtk_file_filter_set_name(filter[3], "T98-Next hard disk image files");
+		gtk_file_filter_set_name(filter[3], "T98-Next hard disk image (*.nhd)");
 		gtk_file_filter_add_pattern(filter[3], "*.[nN][hH][dD]");
 		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[3]);
 	}
@@ -2037,9 +2037,9 @@ create_menu(void)
 
 	gtk_widget_add_events(menubar, EVENT_MASK);
 	g_signal_connect(GTK_OBJECT(menubar), "enter_notify_event",
-	            GTK_SIGNAL_FUNC(enter_notify_evhandler), NULL);
+	            G_CALLBACK(enter_notify_evhandler), NULL);
 	g_signal_connect(GTK_OBJECT(menubar), "leave_notify_event",
-	            GTK_SIGNAL_FUNC(leave_notify_evhandler), NULL);
+	            G_CALLBACK(leave_notify_evhandler), NULL);
 
 	return menubar;
 }
@@ -2062,7 +2062,7 @@ void
 xmenu_toggle_menu(void)
 {
 
-	if (GTK_WIDGET_VISIBLE(menubar))
+	if (gtk_widget_get_visible(menubar))
 		xmenu_hide();
 	else
 		xmenu_show();