--- np2/x11/gtk2/dialog_calendar.c	2010/12/23 06:32:35	1.4
+++ np2/x11/gtk2/dialog_calendar.c	2012/01/23 04:03:22	1.7
@@ -1,5 +1,3 @@
-/*	$Id: dialog_calendar.c,v 1.4 2010/12/23 06:32:35 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -95,8 +93,6 @@ ok_button_clicked(GtkButton *b, gpointer
 	BYTE val;
 	int i;
 
-	UNUSED(b);
-
 	renewal = FALSE;
 	if (np2cfg.calendar != calendar_kind) {
 		renewal = TRUE;
@@ -134,8 +130,6 @@ static void
 dialog_destroy(GtkWidget *w, GtkWidget **wp)
 {
 
-	UNUSED(wp);
-
 	install_idle_process();
 	gtk_widget_destroy(w);
 }
@@ -165,20 +159,15 @@ static void
 now_button_clicked(GtkButton *b, gpointer d)
 {
 
-	UNUSED(b);
-	UNUSED(d);
-
 	set_virtual_calendar(FALSE);
 }
 
 static void
 calendar_radiobutton_clicked(GtkButton *b, gpointer d)
 {
-	gint virtual = (gint)d;
+	gint virtual = GPOINTER_TO_UINT(d);
 	int i;
 
-	UNUSED(b);
-
 	calendar_kind = virtual ? 0 : 1;
 
 	for (i = 0; i < NELEMENTS(vircal); i++) {
@@ -219,14 +208,17 @@ create_calendar_dialog(void)
 	 * calendar kind radiobutton
 	 */
 	for (i = 0; i < NELEMENTS(calendar_kind_str); i++) {
-		calendar_radiobutton[i] = gtk_radio_button_new_with_label_from_widget(i > 0 ? GTK_RADIO_BUTTON(calendar_radiobutton[i-1]) : NULL, calendar_kind_str[i]);
+		calendar_radiobutton[i] =
+		    gtk_radio_button_new_with_label_from_widget(
+		      (i > 0) ? GTK_RADIO_BUTTON(calendar_radiobutton[i-1])
+		        : NULL, calendar_kind_str[i]);
 		gtk_widget_show(calendar_radiobutton[i]);
 		gtk_table_attach_defaults(GTK_TABLE(main_widget),
 		    calendar_radiobutton[i], 0, 3, i, i+1);
 		gtk_widget_set_can_focus(calendar_radiobutton[i], FALSE);
 		g_signal_connect(GTK_OBJECT(calendar_radiobutton[i]),
 		    "clicked", G_CALLBACK(calendar_radiobutton_clicked),
-		    (gpointer)i);
+		    GUINT_TO_POINTER(i));
 	}
 
 	/*