--- np2/x11/gtk2/dialog_calendar.c	2009/03/05 11:50:39	1.3
+++ np2/x11/gtk2/dialog_calendar.c	2010/12/23 06:32:35	1.4
@@ -1,4 +1,4 @@
-/*	$Id: dialog_calendar.c,v 1.3 2009/03/05 11:50:39 monaka Exp $	*/
+/*	$Id: dialog_calendar.c,v 1.4 2010/12/23 06:32:35 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -223,7 +223,7 @@ create_calendar_dialog(void)
 		gtk_widget_show(calendar_radiobutton[i]);
 		gtk_table_attach_defaults(GTK_TABLE(main_widget),
 		    calendar_radiobutton[i], 0, 3, i, i+1);
-		GTK_WIDGET_UNSET_FLAGS(calendar_radiobutton[i], GTK_CAN_FOCUS);
+		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);
@@ -282,8 +282,8 @@ create_calendar_dialog(void)
 	gtk_widget_show(ok_button);
 	gtk_container_set_border_width(GTK_CONTAINER(ok_button), 2);
 	gtk_table_attach_defaults(GTK_TABLE(main_widget),ok_button, 4, 6, 0, 1);
-	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)calendar_dialog);
 	gtk_widget_grab_default(ok_button);