--- np2/win9xc/scrnmng.cpp	2003/10/18 10:00:29	1.2
+++ np2/win9xc/scrnmng.cpp	2004/02/13 20:31:55	1.4
@@ -1,6 +1,8 @@
 #include	"compiler.h"
 #include	<ddraw.h>
+#ifndef __GNUC__
 #include	<winnls32.h>
+#endif
 #include	"resource.h"
 #include	"np2.h"
 #include	"mousemng.h"
@@ -19,7 +21,7 @@ typedef struct {
 	LPDIRECTDRAWSURFACE	backsurf;
 	LPDIRECTDRAWCLIPPER	clipper;
 	LPDIRECTDRAWPALETTE	palette;
-	BYTE				scrnmode;
+	UINT8				scrnmode;
 	int					width;
 	int					height;
 	int					extend;
@@ -28,9 +30,10 @@ typedef struct {
 	RECT				rect;
 #if defined(SUPPORT_16BPP)
 	RGB32				pal16mask;
-	BYTE				r16b;
-	BYTE				l16r;
-	BYTE				l16g;
+	UINT8				r16b;
+	UINT8				l16r;
+	UINT8				l16g;
+	UINT8				padding16;
 #endif
 #if defined(SUPPORT_8BPP)
 	PALETTEENTRY		pal[256];
@@ -285,7 +288,7 @@ void scrnmng_initialize(void) {
 	setwindowsize(640, 400);
 }
 
-BOOL scrnmng_create(BYTE scrnmode) {
+BOOL scrnmng_create(UINT8 scrnmode) {
 
 	DWORD			winstyle;
 	DWORD			winstyleex;
@@ -331,6 +334,12 @@ BOOL scrnmng_create(BYTE scrnmode) {
 		if (!(scrnmode & SCRNMODE_HIGHCOLOR)) {
 #if defined(SUPPORT_8BPP)
 			bitcolor = 8;
+#elif defined(SUPPORT_16BPP)
+			bitcolor = 16;
+#elif defined(SUPPORT_32BPP)
+			bitcolor = 32;
+#elif defined(SUPPORT_24BPP)
+			bitcolor = 24;
 #else
 			goto scre_err;
 #endif
@@ -503,19 +512,23 @@ UINT16 scrnmng_makepal16(RGB32 pal32) {
 
 void scrnmng_topwinui(void) {
 
-	mouse_running(MOUSE_STOP);
+	mousemng_disable(MOUSEPROC_WINUI);
 	if (!ddraw.cliping++) {											// ver0.28
 		if (scrnmng.flag & SCRNFLAG_FULLSCREEN) {
 			ddraw.primsurf->SetClipper(ddraw.clipper);
 		}
+#ifndef __GNUC__
 		WINNLSEnableIME(hWndMain, TRUE);
+#endif
 	}
 }
 
 void scrnmng_clearwinui(void) {
 
 	if ((ddraw.cliping > 0) && (!(--ddraw.cliping))) {
+#ifndef __GNUC__
 		WINNLSEnableIME(hWndMain, FALSE);
+#endif
 		if (scrnmng.flag & SCRNFLAG_FULLSCREEN) {
 			ddraw.primsurf->SetClipper(0);
 		}
@@ -523,7 +536,7 @@ void scrnmng_clearwinui(void) {
 	if (scrnmng.flag & SCRNFLAG_FULLSCREEN) {
 		clearoutfullscreen();
 	}
-	mouse_running(MOUSE_CONT);
+	mousemng_enable(MOUSEPROC_WINUI);
 }
 
 void scrnmng_setwidth(int posx, int width) {