--- np2/wince/gx/gx.cpp	2003/10/21 14:57:41	1.1
+++ np2/wince/gx/gx.cpp	2005/02/11 21:17:23	1.6
@@ -1,18 +1,33 @@
 #include	"compiler.h"
 #include	"gx.h"
 
+#if !defined(GX_DLL)
 
-#ifndef SIZE_QVGA
+#if defined(SIZE_QVGA)
+#if defined(SUPPORT_SOFTKBD)
+enum {
+	WINDOW_WIDTH	= 320,
+	WINDOW_HEIGHT	= 240
+};
+#else
+enum {
+	WINDOW_WIDTH	= 320,
+	WINDOW_HEIGHT	= 200
+};
+#endif
+#else
+#if defined(SUPPORT_SOFTKBD)
 enum {
 	WINDOW_WIDTH	= 640,
 	WINDOW_HEIGHT	= 480
 };
 #else
 enum {
-	WINDOW_WIDTH	= 320,
-	WINDOW_HEIGHT	= 240
+	WINDOW_WIDTH	= 640,
+	WINDOW_HEIGHT	= 400
 };
 #endif
+#endif
 
 #pragma pack(push, 1)
 typedef struct {
@@ -33,9 +48,9 @@ enum {
 };
 
 #if defined(_WIN32_WCE)
-static const TCHAR taskbarclass[] = STRLITERAL("HHTaskBar");
+static const TCHAR taskbarclass[] = _T("HHTaskBar");
 #else
-static const TCHAR taskbarclass[] = STRLITERAL("Shell_TrayWnd");
+static const TCHAR taskbarclass[] = _T("Shell_TrayWnd");
 #endif
 
 
@@ -305,29 +320,37 @@ int GXSuspend(void) {
 
 	HWND	hTaskBar;
 
-	if (!(GXFlag & GX_WINDOW)) {
-		hTaskBar = FindWindow(taskbarclass, NULL);
-		if (hTaskBar) {
-			ShowWindow(hTaskBar, SW_SHOW);
+	if (gxhwnd) {
+		if (!(GXFlag & GX_WINDOW)) {
+			hTaskBar = FindWindow(taskbarclass, NULL);
+			if (hTaskBar) {
+				ShowWindow(hTaskBar, SW_SHOW);
+			}
 		}
+		return(1);
+	}
+	else {
+		return(0);
 	}
-	return(1);
 }
 
 int GXResume(void) {
 
 	HWND	hTaskBar;
 
-	if (!(GXFlag & GX_WINDOW)) {
-		hTaskBar = FindWindow(taskbarclass, NULL);
-		if (hTaskBar) {
-			ShowWindow(hTaskBar, SW_HIDE);
-		}
-		if (gxhwnd) {
+	if (gxhwnd) {
+		if (!(GXFlag & GX_WINDOW)) {
+			hTaskBar = FindWindow(taskbarclass, NULL);
+			if (hTaskBar) {
+				ShowWindow(hTaskBar, SW_HIDE);
+			}
 			MoveWindow(gxhwnd, 0, 0, GXWidth, GXHeight, TRUE);
 		}
+		return(1);
+	}
+	else {
+		return(0);
 	}
-	return(1);
 }
 
 int GXOpenInput(void) {
@@ -345,3 +368,5 @@ GXKeyList GXGetDefaultKeys(int iOptions)
 	return(gxkl);
 }
 
+#endif
+