--- np2/x11/gtk2/gtk_mouse.c	2004/07/14 16:01:40	1.1
+++ np2/x11/gtk2/gtk_mouse.c	2005/03/12 12:36:57	1.3
@@ -10,8 +10,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
@@ -39,11 +37,11 @@ typedef struct {
 	int lastmouse;		// working
 	short mousex;
 	short mousey;
-	BYTE mouseb;
+	UINT8 mouseb;
 
-	BYTE mouse_move_ratio;
-	BYTE mouse_move_mul;
-	BYTE mouse_move_div;
+	UINT8 mouse_move_ratio;
+	UINT8 mouse_move_mul;
+	UINT8 mouse_move_div;
 
 	GdkPixmap *cursor_pixmap;
 	GdkCursor *cursor;
@@ -118,7 +116,7 @@ mouseonoff(int flag)
 	}
 }
 
-BYTE
+UINT8
 mouse_flag(void)
 {
 
@@ -126,9 +124,9 @@ mouse_flag(void)
 }
 
 void
-mouse_running(BYTE flg)
+mouse_running(UINT8 flg)
 {
-	BYTE mf = ms.mouserunning;
+	UINT8 mf = ms.mouserunning;
 
 	switch (flg & 0xc0) {
 	case 0x00:
@@ -165,8 +163,8 @@ mousemng_callback(void)
 	}
 }
 
-BYTE
-mouse_btn(BYTE button)
+UINT8
+mouse_btn(UINT8 button)
 {
 
 	if ((ms.lastmouse & 1) == 0)
@@ -192,7 +190,7 @@ mouse_btn(BYTE button)
 	return 1;
 }
 
-BYTE
+UINT8
 mousemng_getstat(short *x, short *y, int clear)
 {
 
@@ -214,7 +212,7 @@ mousemng_getstat(short *x, short *y, int
 }
 
 void
-mousemng_set_ratio(BYTE new_ratio)
+mousemng_set_ratio(UINT8 new_ratio)
 {
 
 	np2oscfg.mouse_move_ratio = new_ratio;