From 8953748b9aa9e69f0f56d47de30255be6bf0c63f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 12 Nov 2007 15:15:47 +0000 Subject: [PATCH] update wxUSE_UNICODE and wxUSE_WCHAR_T descriptions, set the former to 1 by default git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/setup_inc.h | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index aad1179e16..16836b44de 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -143,29 +143,15 @@ // Unicode support // ---------------------------------------------------------------------------- -// Set wxUSE_UNICODE to 1 to compile wxWidgets 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/XP -// (Windows 9x doesn't support it and the programs compiled in Unicode mode -// will not run under 9x -- but see wxUSE_UNICODE_MSLU below). -// -// Default is 0 (but only because of makefiles) -// -// Recommended setting: 1 +// These settings are obsolete: the library is always built in Unicode mode +// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if +// absolutely necessary -- updating it is strongly recommended as the ANSI mode +// will disappear completely in future wxWidgets releases. #ifndef wxUSE_UNICODE - #define wxUSE_UNICODE 0 + #define wxUSE_UNICODE 1 #endif -// 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 +// wxUSE_WCHAR_T is required by wxWidgets now, don't change. #define wxUSE_WCHAR_T 1 // ---------------------------------------------------------------------------- -- 2.45.2