--- np2/x11/gtk2/dialog_sound.c	2009/09/28 13:47:12	1.7
+++ np2/x11/gtk2/dialog_sound.c	2012/01/23 04:03:22	1.12
@@ -1,5 +1,3 @@
-/*	$Id: dialog_sound.c,v 1.7 2009/09/28 13:47:12 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2004 NONAKA Kimihiro
  * All rights reserved.
@@ -332,8 +330,6 @@ ok_button_clicked(GtkButton *b, gpointer
 	int i;
 	BOOL renewal;
 
-	UNUSED(b);
-
 	/* Mixer */
 	renewal = FALSE;
 	for (i = 0; i < NELEMENTS(mixer_vol_tbl); i++) {
@@ -591,8 +587,6 @@ static void
 dialog_destroy(GtkWidget *w, GtkWidget **wp)
 {
 
-	UNUSED(wp);
-
 	install_idle_process();
 	gtk_widget_destroy(w);
 }
@@ -602,9 +596,6 @@ mixer_default_button_clicked(GtkButton *
 {
 	int i;
 
-	UNUSED(b);
-	UNUSED(d);
-
 	for (i = 0; i < NELEMENTS(mixer_vol_tbl); i++) {
 		gtk_adjustment_set_value(GTK_ADJUSTMENT(mixer_adj[i]), 64.0);
 	}
@@ -618,9 +609,6 @@ snd14_default_button_clicked(GtkButton *
 	};
 	int i;
 
-	UNUSED(b);
-	UNUSED(d);
-
 	for (i = 0; i < NELEMENTS(snd14_adj); i++) {
 		gtk_adjustment_set_value(GTK_ADJUSTMENT(snd14_adj[i]), defval[i]);
 	}
@@ -630,9 +618,6 @@ static void
 snd26_default_button_clicked(GtkButton *b, gpointer d)
 {
 
-	UNUSED(b);
-	UNUSED(d);
-
 	gtk_entry_set_text(GTK_ENTRY(snd26_ioport_entry), "0188");
 	gtk_entry_set_text(GTK_ENTRY(snd26_int_entry), "INT5");
 	gtk_entry_set_text(GTK_ENTRY(snd26_romaddr_entry), "CC000");
@@ -642,9 +627,6 @@ static void
 snd86_default_button_clicked(GtkButton *b, gpointer d)
 {
 
-	UNUSED(b);
-	UNUSED(d);
-
 	gtk_entry_set_text(GTK_ENTRY(snd86_ioport_entry), "0188");
 	gtk_entry_set_text(GTK_ENTRY(snd86_int_entry), "INT5");
 	gtk_entry_set_text(GTK_ENTRY(snd86_soundid_entry), "4x");
@@ -659,9 +641,6 @@ spb_default_button_clicked(GtkButton *b,
 {
 	int i;
 
-	UNUSED(b);
-	UNUSED(d);
-
 	gtk_entry_set_text(GTK_ENTRY(spb_ioport_entry), "0188");
 	gtk_entry_set_text(GTK_ENTRY(spb_int_entry), "INT5");
 	gtk_entry_set_text(GTK_ENTRY(spb_romaddr_entry), "CC000");
@@ -675,9 +654,7 @@ static void
 driver_radiobutton_clicked(GtkButton *b, gpointer d)
 {
 
-	UNUSED(b);
-
-	driver_snddrv = (int)d;
+	driver_snddrv = GPOINTER_TO_UINT(d);
 }
 
 static GtkWidget *
@@ -1108,22 +1085,20 @@ joypad_device_changed(GtkEditable *e, gp
 {
 	GtkWidget *axis_entry[JOY_NAXIS];
 	GtkWidget *button_entry[JOY_NBUTTON];
-	const gchar *devname;
+	const gchar *dvname;
 	int drv;
 	int i, j;
 
-	UNUSED(d);
-
-	devname = gtk_entry_get_text(GTK_ENTRY(e));
+	dvname = gtk_entry_get_text(GTK_ENTRY(e));
 	if ((joypad_devlist == NULL)
-	 || (devname == NULL)
-	 || (strcmp(devname, joypad_nodevice_str) == 0)) {
+	 || (dvname == NULL)
+	 || (strcmp(dvname, joypad_nodevice_str) == 0)) {
 		milstr_ncpy(joypad_devname, joypad_nodevice_str, sizeof(joypad_devname));
 		return;
 	}
 
 	for (drv = 0; joypad_devlist[drv] != NULL; ++drv) {
-		if (strcmp(devname, joypad_devlist[drv]->devname) == 0) {
+		if (strcmp(dvname, joypad_devlist[drv]->devname) == 0) {
 			break;
 		}
 	}
@@ -1464,15 +1439,15 @@ create_sound_dialog(void)
 	cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
 	gtk_widget_show(cancel_button);
 	gtk_box_pack_end(GTK_BOX(confirm_widget), cancel_button, FALSE, FALSE, 0);
-	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(sound_dialog));
 
 	ok_button = gtk_button_new_from_stock(GTK_STOCK_OK);
 	gtk_widget_show(ok_button);
 	gtk_box_pack_end(GTK_BOX(confirm_widget), ok_button, FALSE, FALSE, 0);
-	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)sound_dialog);
 	gtk_widget_grab_default(ok_button);