--- np2/x11/gtk2/window_softkbd.c	2004/07/14 16:01:40	1.1
+++ np2/x11/gtk2/window_softkbd.c	2011/01/15 18:43:14	1.5
@@ -1,5 +1,3 @@
-/*	$Id: window_softkbd.c,v 1.1 2004/07/14 16:01:40 monaka Exp $	*/
-
 #include "compiler.h"
 
 #if defined(SUPPORT_SOFTKBD)
@@ -74,9 +72,6 @@ static void
 skbdwin_window_destroy(GtkWidget *w, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	if (skwin.window)
 		skwin.window = NULL;
 	drawmng_release(skwin.hdl);
@@ -87,8 +82,6 @@ static gboolean
 skbdwin_expose(GtkWidget *w, GdkEventExpose *ev)
 {
 
-	UNUSED(w);
-
 	if (ev->type == GDK_EXPOSE) {
 		if (ev->count == 0) {
 			skbdwin_draw();
@@ -102,9 +95,6 @@ static gboolean
 skbdwin_key_press(GtkWidget *w, GdkEventKey *ev, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	if (ev->type == GDK_KEY_PRESS) {
 		if ((ev->keyval != GDK_F12) || (np2oscfg.F12KEY != 0))
 			gtkkbd_keydown(ev->keyval);
@@ -116,9 +106,6 @@ static gboolean
 skbdwin_key_release(GtkWidget *w, GdkEventKey *ev, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	if (ev->type == GDK_KEY_RELEASE) {
 		if ((ev->keyval != GDK_F12) || (np2oscfg.F12KEY != 0))
 			gtkkbd_keyup(ev->keyval);
@@ -131,9 +118,6 @@ static gboolean
 skbdwin_button_press(GtkWidget *w, GdkEventButton *ev, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	if (ev->type == GDK_BUTTON_PRESS) {
 		switch (ev->button) {
 		case 1:
@@ -149,9 +133,6 @@ static gboolean
 skbdwin_button_release(GtkWidget *w, GdkEventButton *ev, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	if (ev->type == GDK_BUTTON_RELEASE) {
 		switch (ev->button) {
 		case 1:
@@ -191,7 +172,8 @@ skbdwin_create(void)
 	gtk_window_set_resizable(GTK_WINDOW(skwin.window), FALSE);
 	gtk_widget_add_events(skwin.window, EVENT_MASK);
 	g_signal_connect(GTK_OBJECT(skwin.window), "destroy",
-	    GTK_SIGNAL_FUNC(skbdwin_window_destroy), NULL);
+	    G_CALLBACK(skbdwin_window_destroy), NULL);
+	gtk_widget_realize(skwin.window);
 
 	main_widget = gtk_vbox_new(FALSE, 2);
 	gtk_widget_show(main_widget);
@@ -205,21 +187,20 @@ skbdwin_create(void)
 	da = GTK_WIDGET(drawmng_get_widget_handle(skwin.hdl));
 	gtk_box_pack_start(GTK_BOX(main_widget), da, FALSE, TRUE, 0);
 	gtk_widget_show(da);
-	gtk_widget_realize(skwin.window);
 
 	g_signal_connect(GTK_OBJECT(skwin.window), "key_press_event",
-	    GTK_SIGNAL_FUNC(skbdwin_key_press), NULL);
+	    G_CALLBACK(skbdwin_key_press), NULL);
 	g_signal_connect(GTK_OBJECT(skwin.window), "key_release_event",
-	    GTK_SIGNAL_FUNC(skbdwin_key_release), NULL);
+	    G_CALLBACK(skbdwin_key_release), NULL);
 	g_signal_connect(GTK_OBJECT(skwin.window), "button_press_event",
-	    GTK_SIGNAL_FUNC(skbdwin_button_press), NULL);
+	    G_CALLBACK(skbdwin_button_press), NULL);
 	g_signal_connect(GTK_OBJECT(skwin.window), "button_release_event",
-	    GTK_SIGNAL_FUNC(skbdwin_button_release), NULL);
+	    G_CALLBACK(skbdwin_button_release), NULL);
 
 	g_signal_connect(GTK_OBJECT(da), "expose_event",
-	    GTK_SIGNAL_FUNC(skbdwin_expose), NULL);
+	    G_CALLBACK(skbdwin_expose), NULL);
 
-	gtk_widget_show(skwin.window);
+	gtk_widget_show_all(skwin.window);
 
 	drawmng_set_size(skwin.hdl, width, height);
 	drawmng_invalidate(skwin.hdl, NULL);