--- np2/x11/gtk2/dialog_midi.c	2009/03/05 11:50:39	1.4
+++ np2/x11/gtk2/dialog_midi.c	2011/01/15 18:43:13	1.7
@@ -1,5 +1,3 @@
-/*	$Id: dialog_midi.c,v 1.4 2009/03/05 11:50:39 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -87,8 +85,6 @@ ok_button_clicked(GtkButton *b, gpointer
 	UINT update;
 	int i;
 
-	UNUSED(b);
-
 	update = 0;
 	if (np2cfg.mpuopt != mpuopt) {
 		update |= SYS_UPDATECFG | SYS_UPDATEMIDI;
@@ -177,8 +173,6 @@ static void
 dialog_destroy(GtkWidget *w, GtkWidget **wp)
 {
 
-	UNUSED(wp);
-
 	install_idle_process();
 	gtk_widget_destroy(w);
 }
@@ -190,8 +184,6 @@ mpu98_ioport_entry_changed(GtkEditable *
 	gchar *p;
 	BYTE val;
 
-	UNUSED(d);
-
 	utf8 = gtk_entry_get_text(GTK_ENTRY(e));
 	if (utf8 != NULL) {
 		p = g_filename_from_utf8(utf8, -1, NULL, NULL, NULL);
@@ -213,8 +205,6 @@ mpu98_intr_entry_changed(GtkEditable *e,
 	gchar *p;
 	BYTE val;
 
-	UNUSED(d);
-
 	utf8 = gtk_entry_get_text(GTK_ENTRY(e));
 	if (utf8 != NULL) {
 		p = g_filename_from_utf8(utf8, -1, NULL, NULL, NULL);
@@ -235,9 +225,6 @@ static void
 mpu98_default_button_clicked(GtkButton *b, gpointer d)
 {
 
-	UNUSED(b);
-	UNUSED(d);
-
 	gtk_entry_set_text(GTK_ENTRY(mpu98_ioport_entry), "E0D0");
 	gtk_entry_set_text(GTK_ENTRY(mpu98_intr_entry), "INT2");
 }
@@ -250,9 +237,6 @@ mpu98_mimpi_def_button_clicked(GtkButton
 	gchar *utf8, *path;
 	struct stat sb;
 
-	UNUSED(b);
-	UNUSED(d);
-
 	dialog = gtk_file_chooser_dialog_new("Open MIMPI define file",
 	    GTK_WINDOW(main_window), GTK_FILE_CHOOSER_ACTION_OPEN, 
 	    GTK_STOCK_OPEN, GTK_RESPONSE_OK,
@@ -594,8 +578,8 @@ create_midi_dialog(void)
 	ok_button = gtk_button_new_from_stock(GTK_STOCK_OK);
 	gtk_widget_show(ok_button);
 	gtk_container_add(GTK_CONTAINER(confirm_widget), ok_button);
-	GTK_WIDGET_SET_FLAGS(ok_button, GTK_CAN_DEFAULT);
-	GTK_WIDGET_SET_FLAGS(ok_button, GTK_HAS_DEFAULT);
+	gtk_widget_set_can_default(ok_button, TRUE);
+	gtk_widget_has_default(ok_button);
 	g_signal_connect(GTK_OBJECT(ok_button), "clicked",
 	    G_CALLBACK(ok_button_clicked), (gpointer)midi_dialog);
 	gtk_widget_grab_default(ok_button);
@@ -603,7 +587,7 @@ create_midi_dialog(void)
 	cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
 	gtk_widget_show(cancel_button);
 	gtk_container_add(GTK_CONTAINER(confirm_widget), cancel_button);
-	GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default(cancel_button, TRUE);
 	g_signal_connect_swapped(GTK_OBJECT(cancel_button), "clicked",
 	    G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(midi_dialog));