From 3657a5a4d8d0a8b48d2b233bab33b3c2a1f3fac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sun, 13 Apr 2008 12:17:37 +0000
Subject: [PATCH] Fixed IMPLEMENT_APP() to be compatible with the -WU flag of
 Borland C++ (patch #1935997)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt     |  2 ++
 include/wx/msw/app.h | 27 ++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 42da06b321..199ed94c2f 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -166,6 +166,8 @@ wxMSW:
 - Text controls with wxTE_RICH style now also generate wxClipboardTextEvents.
 - Fixed wxSpinCtrl::GetClientSize() to return sensible value and not just
   spin button's client size.
+- Fixed IMPLEMENT_APP() to be compatible with the -WU flag of Borland C++
+  compiler (Matthias Bohm).
 
 wxGTK:
 
diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index e4986770c6..6c8eac89a1 100644
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -109,6 +109,30 @@ wxEntry(HINSTANCE hInstance,
         wxCmdLineArgType pCmdLine = NULL,
         int nCmdShow = SW_SHOWNORMAL);
 
+#if defined(__BORLANDC__) && wxUSE_UNICODE
+    // Borland C++ has the following nonstandard behaviour: when the -WU
+    // command line flag is used, the linker expects to find wWinMain instead
+    // of WinMain. This flag causes the compiler to define _UNICODE and
+    // UNICODE symbols and there's no way to detect its use, so we have to
+    // define both WinMain and wWinMain so that IMPLEMENT_WXWIN_MAIN works
+    // for both code compiled with and without -WU.
+    // See http://sourceforge.net/tracker/?func=detail&atid=309863&aid=1935997&group_id=9863
+    // for more details.
+    #define IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD                        \
+        extern "C" int WINAPI wWinMain(HINSTANCE hInstance,                 \
+                                      HINSTANCE hPrevInstance,              \
+                                      wchar_t * WXUNUSED(lpCmdLine),        \
+                                      int nCmdShow)                         \
+        {                                                                   \
+            /* NB: wxEntry expects lpCmdLine argument to be char*, not */   \
+            /*     wchar_t*, but fortunately it's not used anywhere    */   \
+            /*     and we can simply pass NULL in:                     */   \
+            return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);       \
+        }
+#else
+    #define IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
+#endif // defined(__BORLANDC__) && wxUSE_UNICODE
+
 #define IMPLEMENT_WXWIN_MAIN \
     extern "C" int WINAPI WinMain(HINSTANCE hInstance,                    \
                                   HINSTANCE hPrevInstance,                \
@@ -116,7 +140,8 @@ wxEntry(HINSTANCE hInstance,
                                   int nCmdShow)                           \
     {                                                                     \
         return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);    \
-    }
+    }                                                                     \
+    IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
 
 #endif // _WX_APP_H_