--- np2/x11/gtk2/gtk_main.c	2008/03/13 16:27:39	1.10
+++ np2/x11/gtk2/gtk_main.c	2012/01/23 03:57:31	1.16
@@ -1,7 +1,5 @@
-/*	$Id: gtk_main.c,v 1.10 2008/03/13 16:27:39 monaka Exp $	*/
-
 /*
- * Copyright (c) 2004 NONAKA Kimihiro <aw9k-nnk@asahi-net.or.jp>
+ * Copyright (c) 2004 NONAKA Kimihiro
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,10 +68,6 @@ static gboolean
 destroy_evhandler(GtkWidget *w, GdkEventAny *ev, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(ev);
-	UNUSED(p);
-
 	toolkit_widget_quit();
 
 	return TRUE;
@@ -87,9 +81,6 @@ static gboolean
 configure_evhandler(GtkWidget *w, GdkEventConfigure *ev, gpointer p)
 {
 
-	UNUSED(ev);
-	UNUSED(p);
-
 	gdk_draw_rectangle(w->window, w->style->black_gc, TRUE,
 	    0, 0, w->allocation.width, w->allocation.height);
 	return TRUE;
@@ -103,9 +94,6 @@ static gboolean
 expose_evhandler(GtkWidget *w, GdkEventExpose *ev, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	if (ev->count == 0) {
 		scrndraw_redraw();
 	}
@@ -120,9 +108,6 @@ static gboolean
 key_press_evhandler(GtkWidget *w, GdkEventKey *ev, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	if (ev->keyval == GDK_F11) {
 		if ((np2oscfg.F11KEY == 1) && (scrnmode & SCRNMODE_FULLSCREEN))
 			xmenu_toggle_menu();
@@ -143,9 +128,6 @@ static gboolean
 key_release_evhandler(GtkWidget *w, GdkEventKey *ev, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	if ((ev->keyval != GDK_F12) || (np2oscfg.F12KEY != 0))
 		gtkkbd_keyup(ev->keyval);
 	return TRUE;
@@ -159,9 +141,6 @@ static gboolean
 button_press_evhandler(GtkWidget *w, GdkEventButton *ev, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	switch (ev->button) {
 	case 1:
 		mouse_btn(MOUSE_LEFTDOWN);
@@ -186,9 +165,6 @@ static gboolean
 button_release_evhandler(GtkWidget *w, GdkEventButton *ev, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	switch (ev->button) {
 	case 1:
 		mouse_btn(MOUSE_LEFTUP);
@@ -212,9 +188,6 @@ static gboolean
 motion_notify_evhandler(GtkWidget *w, GdkEventMotion *ev, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	if ((scrnmode & SCRNMODE_FULLSCREEN) && (ev->y < 8.0))
 		xmenu_show();
 
@@ -229,8 +202,6 @@ static gint
 main_loop_quit(gpointer p)
 {
 
-	UNUSED(p);
-
 	scrnmng_fullscreen(0);
 
 	return 0;
@@ -342,22 +313,22 @@ gui_gtk_widget_create(void)
 	set_icon_bitmap(main_window);
 
 	g_signal_connect(GTK_OBJECT(main_window), "destroy", 
-	    GTK_SIGNAL_FUNC(destroy_evhandler), "WM destroy");
+	    G_CALLBACK(destroy_evhandler), (gpointer)"WM destroy");
 	g_signal_connect(GTK_OBJECT(main_window), "key_press_event",
-	    GTK_SIGNAL_FUNC(key_press_evhandler), NULL);
+	    G_CALLBACK(key_press_evhandler), NULL);
 	g_signal_connect(GTK_OBJECT(main_window), "key_release_event",
-	    GTK_SIGNAL_FUNC(key_release_evhandler), NULL);
+	    G_CALLBACK(key_release_evhandler), NULL);
 	g_signal_connect(GTK_OBJECT(main_window), "button_press_event",
-	    GTK_SIGNAL_FUNC(button_press_evhandler), NULL);
+	    G_CALLBACK(button_press_evhandler), NULL);
 	g_signal_connect(GTK_OBJECT(main_window), "button_release_event",
-	    GTK_SIGNAL_FUNC(button_release_evhandler), NULL);
+	    G_CALLBACK(button_release_evhandler), NULL);
 	g_signal_connect(GTK_OBJECT(main_window), "motion_notify_event",
-	    GTK_SIGNAL_FUNC(motion_notify_evhandler), NULL);
+	    G_CALLBACK(motion_notify_evhandler), NULL);
 
 	g_signal_connect(GTK_OBJECT(drawarea), "configure_event",
-	    GTK_SIGNAL_FUNC(configure_evhandler), NULL);
+	    G_CALLBACK(configure_evhandler), NULL);
 	g_signal_connect(GTK_OBJECT(drawarea), "expose_event",
-	    GTK_SIGNAL_FUNC(expose_evhandler), NULL);
+	    G_CALLBACK(expose_evhandler), NULL);
 }
 
 void
@@ -448,7 +419,7 @@ gui_gtk_msgbox(const char *title, const 
 
 	dialog = gtk_message_dialog_new(GTK_WINDOW(main_window),
 	    GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL,
-	    msgtype, btntype, msg);
+	    msgtype, btntype, "%s", msg);
 	gtk_window_set_title(GTK_WINDOW(dialog), title);
 
 	gtk_widget_show_all(dialog);