--- np2/x11/gtk2/gtk_font.c	2004/07/14 16:01:40	1.1
+++ np2/x11/gtk2/gtk_font.c	2005/03/12 12:36:57	1.4
@@ -1,4 +1,4 @@
-/*	$Id: gtk_font.c,v 1.1 2004/07/14 16:01:40 monaka Exp $	*/
+/*	$Id: gtk_font.c,v 1.4 2005/03/12 12:36:57 monaka Exp $	*/
 
 /*
  * Copyright (c) 2004 NONAKA Kimihiro
@@ -12,8 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -197,7 +195,7 @@ getfont1(FNTMNG fhdl, FNTDAT fdat, const
 	img = gdk_drawable_get_image(fhdl->backsurf,
 	    0, 0, fhdl->rect.width, fhdl->rect.height);
 	if (img) {
-		BYTE *p = (BYTE *)(fdat + 1);
+		UINT8 *p = (UINT8 *)(fdat + 1);
 		unsigned long pixel;
 		int x, y;
 
@@ -313,9 +311,9 @@ fontmng_get(void *hdl, const char *str)
 	}
 
 	if (((((str[0] ^ 0x20) - 0xa1) & 0xff) < 0x3c) && (str[1] != '\0')) {
-		codecnv_sjis2euc(buf, 4, str, 2);
+		codecnv_sjistoeuc(buf, 4, str, 2);
 		len = 2;
-	} else if ((BYTE)str[0] >= 0xa1 && (BYTE)str[0] <= 0xdf) {
+	} else if ((UINT8)str[0] >= 0xa1 && (UINT8)str[0] <= 0xdf) {
 		buf[0] = 0x8e;
 		buf[1] = str[0];
 		buf[2] = '\0';