--- np2/x11/gtk2/window_keydisp.c	2004/07/14 16:01:40	1.1
+++ np2/x11/gtk2/window_keydisp.c	2011/01/15 16:01:53	1.5
@@ -1,4 +1,4 @@
-/*	$Id: window_keydisp.c,v 1.1 2004/07/14 16:01:40 monaka Exp $	*/
+/*	$Id: window_keydisp.c,v 1.5 2011/01/15 16:01:53 monaka Exp $	*/
 
 #include "compiler.h"
 
@@ -30,8 +30,8 @@ typedef struct {
 static KDWIN kdwin;
 
 static void drawkeys(void);
-static void setkeydispmode(BYTE mode);
-static BYTE kdispwin_getmode(BYTE cfgmode);
+static void setkeydispmode(UINT8 mode);
+static UINT8 kdispwin_getmode(UINT8 cfgmode);
 
 
 /*
@@ -42,9 +42,6 @@ static void
 kdispwin_window_destroy(GtkWidget *w, gpointer p)
 {
 
-	UNUSED(w);
-	UNUSED(p);
-
 	if (kdwin.window)
 		kdwin.window = NULL;
 	drawmng_release(kdwin.hdl);
@@ -59,10 +56,6 @@ static void
 close_window(gpointer data, guint action, GtkWidget *w)
 {
 
-	UNUSED(data);
-	UNUSED(action);
-	UNUSED(w);
-
 	xmenu_toggle_item(kdwin.menuhdl, "keydisp", FALSE);
 }
 
@@ -70,9 +63,6 @@ static void
 change_module(gpointer data, guint action, GtkWidget *w)
 {
 
-	UNUSED(data);
-	UNUSED(w);
-
 	if (kdispcfg.mode != action) {
 		kdispcfg.mode = action;
 		sysmng_update(SYS_UPDATEOSCFG);
@@ -81,7 +71,7 @@ change_module(gpointer data, guint actio
 }
 
 static void
-xmenu_select_module(BYTE mode)
+xmenu_select_module(UINT8 mode)
 {
 	static const char *name[] = {
 		NULL,
@@ -135,8 +125,6 @@ static gint
 kdispwin_expose(GtkWidget *w, GdkEventExpose *ev)
 {
 
-	UNUSED(w);
-
 	if (ev->type == GDK_EXPOSE) {
 		if (ev->count == 0) {
 			drawkeys();
@@ -150,12 +138,10 @@ kdispwin_expose(GtkWidget *w, GdkEventEx
 /*
  * keydisp local function
  */
-static BYTE
+static UINT8
 getpal8(CMNPALFN *self, UINT num)
 {
 
-	UNUSED(self);
-
 	if (num < KEYDISP_PALS) {
 		return kdwinpal[num] >> 24;
 	}
@@ -166,8 +152,6 @@ static UINT32
 getpal32(CMNPALFN *self, UINT num)
 {
 
-	UNUSED(self);
-
 	if (num < KEYDISP_PALS) {
 		return kdwinpal[num] & 0xffffff;
 	}
@@ -178,13 +162,11 @@ static UINT16
 cnvpal16(CMNPALFN *self, RGB32 pal32)
 {
 
-	UNUSED(self);
-
 	return (UINT16)drawmng_makepal16(&kdwin.hdl->pal16mask, pal32);
 }
 
-static BYTE
-kdispwin_getmode(BYTE cfgmode)
+static UINT8
+kdispwin_getmode(UINT8 cfgmode)
 {
 
 	switch (cfgmode) {
@@ -222,7 +204,7 @@ setkdwinsize(void)
 }
 
 static void
-setkeydispmode(BYTE mode)
+setkeydispmode(UINT8 mode)
 {
 
 	keydisp_setmode(mode);
@@ -240,7 +222,7 @@ kdispwin_create(void)
 #endif
 	GtkWidget *da;
 	CMNPALFN palfn;
-	BYTE mode;
+	UINT8 mode;
 
 	if (kdwin.window)
 		return;
@@ -249,7 +231,8 @@ kdispwin_create(void)
 	gtk_window_set_title(GTK_WINDOW(kdwin.window), "Key Display");
 	gtk_window_set_resizable(GTK_WINDOW(kdwin.window), FALSE);
 	g_signal_connect(GTK_OBJECT(kdwin.window), "destroy",
-	    GTK_SIGNAL_FUNC(kdispwin_window_destroy), NULL);
+	    G_CALLBACK(kdispwin_window_destroy), NULL);
+	gtk_widget_realize(kdwin.window);
 
 	main_widget = gtk_vbox_new(FALSE, 2);
 	gtk_widget_show(main_widget);
@@ -269,14 +252,13 @@ kdispwin_create(void)
 	da = GTK_WIDGET(drawmng_get_widget_handle(kdwin.hdl));
 	gtk_box_pack_start(GTK_BOX(main_widget), da, FALSE, TRUE, 0);
 	gtk_widget_show(da);
-	gtk_widget_realize(kdwin.window);
 	g_signal_connect(GTK_OBJECT(da), "expose_event",
-	    GTK_SIGNAL_FUNC(kdispwin_expose), NULL);
+	    G_CALLBACK(kdispwin_expose), NULL);
 
 	mode = kdispwin_getmode(kdispcfg.mode);
 	setkeydispmode(mode);
 	setkdwinsize();
-	gtk_widget_show(kdwin.window);
+	gtk_widget_show_all(kdwin.window);
 
 	palfn.get8 = getpal8;
 	palfn.get32 = getpal32;
@@ -303,9 +285,9 @@ kdispwin_destroy(void)
 }
 
 void
-kdispwin_draw(BYTE cnt)
+kdispwin_draw(UINT8 cnt)
 {
-	BYTE flag;
+	UINT8 flag;
 
 	if (kdwin.window) {
 		if (cnt == 0) {