--- np2/wince/gx/gx.cpp	2003/11/22 12:49:49	1.3
+++ np2/wince/gx/gx.cpp	2005/02/11 21:17:23	1.6
@@ -1,17 +1,32 @@
 #include	"compiler.h"
 #include	"gx.h"
 
+#if !defined(GX_DLL)
 
-#ifndef SIZE_QVGA
+#if defined(SIZE_QVGA)
+#if defined(SUPPORT_SOFTKBD)
 enum {
-	WINDOW_WIDTH	= 640,
-	WINDOW_HEIGHT	= 400
+	WINDOW_WIDTH	= 320,
+	WINDOW_HEIGHT	= 240
 };
 #else
 enum {
 	WINDOW_WIDTH	= 320,
-	WINDOW_HEIGHT	= 240
+	WINDOW_HEIGHT	= 200
+};
+#endif
+#else
+#if defined(SUPPORT_SOFTKBD)
+enum {
+	WINDOW_WIDTH	= 640,
+	WINDOW_HEIGHT	= 480
 };
+#else
+enum {
+	WINDOW_WIDTH	= 640,
+	WINDOW_HEIGHT	= 400
+};
+#endif
 #endif
 
 #pragma pack(push, 1)
@@ -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
 
 
@@ -353,3 +368,5 @@ GXKeyList GXGetDefaultKeys(int iOptions)
 	return(gxkl);
 }
 
+#endif
+