From 7c8c7cc23e709bebc7dba5d6e1bbf62b4a556184 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Apr 2004 12:54:20 +0000
Subject: [PATCH] WinMain() is Unicode under CE (how did this work before?)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/app.h | 18 ++++++++++++------
 src/msw/main.cpp |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/include/wx/app.h b/include/wx/app.h
index 85ba83f552..ccc781568e 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -627,20 +627,26 @@ public:
     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"
 
-    #ifdef SW_SHOWNORMAL
-    #define wxSW_SHOWNORMAL SW_SHOWNORMAL
+    #ifndef SW_SHOWNORMAL
+        #define SW_SHOWNORMAL 1
+    #endif
+
+    // WinMain() is always ANSI, even in Unicode build, under normal Windows
+    // but is always Unicode under CE
+    #ifdef __WXWINCE__
+        typedef wchar_t *wxCmdLineArgType;
     #else
-    #define wxSW_SHOWNORMAL 0
+        typedef char *wxCmdLineArgType;
     #endif
 
     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry(HINSTANCE hInstance,                               \
                            HINSTANCE hPrevInstance = NULL,                    \
-                           char *pCmdLine = NULL,                             \
-                           int nCmdShow = wxSW_SHOWNORMAL);                         \
+                           wxCmdLineArgType pCmdLine = NULL,                  \
+                           int nCmdShow = SW_SHOWNORMAL);                     \
         extern "C" int WINAPI WinMain(HINSTANCE hInstance,                    \
                                       HINSTANCE hPrevInstance,                \
-                                      char *lpCmdLine,                        \
+                                      wxCmdLineArgType lpCmdLine,             \
                                       int nCmdShow)                           \
         {                                                                     \
             return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);    \
diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index fd950861b2..1a136df962 100644
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -61,7 +61,7 @@
 
 WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
                         HINSTANCE WXUNUSED(hPrevInstance),
-                        char * WXUNUSED(pCmdLine),
+                        wxCmdLineArgType WXUNUSED(pCmdLine),
                         int nCmdShow)
 {
     // remember the parameters Windows gave us
-- 
2.47.2