--- np2/x11/gtk2/dialog_screen.c	2009/03/05 11:50:39	1.3
+++ np2/x11/gtk2/dialog_screen.c	2011/01/15 18:43:13	1.7
@@ -1,5 +1,3 @@
-/*	$Id: dialog_screen.c,v 1.3 2009/03/05 11:50:39 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
  * All rights reserved.
@@ -87,8 +85,6 @@ ok_button_clicked(GtkButton *b, gpointer
 	BOOL renewal;
 	int i;
 
-	UNUSED(b);
-
 	/* Video tab */
 	video_lcd = GTK_TOGGLE_BUTTON(video_lcd_checkbutton)->active;
 	video_lcdrev = GTK_TOGGLE_BUTTON(video_lcd_reverse_checkbutton)->active;
@@ -173,8 +169,6 @@ static void
 dialog_destroy(GtkWidget *w, GtkWidget **wp)
 {
 
-	UNUSED(wp);
-
 	install_idle_process();
 	gtk_widget_destroy(w);
 }
@@ -190,8 +184,6 @@ static void
 uPD72020_radiobutton_clicked(GtkButton *b, gpointer d)
 {
 
-	UNUSED(b);
-
 	chip_uPD72020 = (gint)d;
 }
 
@@ -199,8 +191,6 @@ static void
 gc_radiobutton_clicked(GtkButton *b, gpointer d)
 {
 
-	UNUSED(b);
-
 	chip_gc_kind = (gint)d;
 }
 
@@ -277,8 +267,8 @@ create_video_note(void)
 static GtkWidget*
 create_chip_note(void)
 {
-	static char *gdc_str[] = { "uPD7220", "uPD72020" };
-	static char *gc_str[] = { "None", "GRCG", "GRCG+", "EGC" };
+	static const char *gdc_str[] = { "uPD7220", "uPD72020" };
+	static const char *gc_str[] = { "None", "GRCG", "GRCG+", "EGC" };
 	GtkWidget *main_widget;
 	GtkWidget *gdc_frame;
 	GtkWidget *gdc_hbox;
@@ -460,7 +450,7 @@ create_screen_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, FALSE);
 	g_signal_connect_swapped(GTK_OBJECT(cancel_button), "clicked",
 	    G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(screen_dialog));
 
@@ -469,8 +459,8 @@ create_screen_dialog(void)
 	gtk_box_pack_end(GTK_BOX(confirm_widget), ok_button, FALSE, FALSE, 0);
 	g_signal_connect(GTK_OBJECT(ok_button), "clicked",
 	    G_CALLBACK(ok_button_clicked), (gpointer)screen_dialog);
-	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);
 	gtk_widget_grab_default(ok_button);
 
 	gtk_widget_show_all(screen_dialog);