From 9e13e99d6d686438ab6a32318b40bc68a84d2086 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 28 Apr 2000 05:36:24 +0000
Subject: [PATCH] wxUSE_UNICODE set to 0 by default, added wxUSE_WCHAR_T

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/setup0.h | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 21e36b2f9b..b6a537f68f 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -121,6 +121,33 @@
     #define wxUSE_ON_FATAL_EXCEPTION 0
 #endif
 
+// ----------------------------------------------------------------------------
+// Unicode support
+// ----------------------------------------------------------------------------
+
+// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be
+// defined as wchar_t, wxString will use Unicode internally. If you set this
+// to 1, you must use wxT() macro for all literal strings in the program.
+//
+// Unicode is currently only fully supported under Windows NT/2000 (Windows 9x
+// doesn't support it and the programs compiled in Unicode mode will not run
+// under 9x).
+//
+// Default is 0
+//
+// Recommended setting: 0 (unless you only plan to use Windows NT/2000)
+#define wxUSE_UNICODE 0
+
+// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
+// compiling the program in Unicode mode. More precisely, it will be possible
+// to construct wxString from a wide (Unicode) string and convert any wxString
+// to Unicode.
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_WCHAR_T 1
+
 // ----------------------------------------------------------------------------
 // global features
 // ----------------------------------------------------------------------------
@@ -160,9 +187,6 @@
 // non GUI features selection
 // ----------------------------------------------------------------------------
 
-// Set to 1 to build in Unicode mode (wxchar.h will define _UNICODE and UNICODE)
-#define wxUSE_UNICODE       1
-
 // Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
 // integer which is implemented in terms of native 64 bit integers if any or
 // uses emulation otherwise.