From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 22 Oct 2003 21:24:16 +0000 (+0000)
Subject: moved wxUSE_UNICODE <-> _UNICODE checks to wx/platform.h from wx/wxchar.h because... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/63e7198ba8304880bc279e0e99f1ed7b49e35d96

moved wxUSE_UNICODE <-> _UNICODE checks to wx/platform.h from wx/wxchar.h because wxUSE_UNICODE is used in wx/defs.h itself, before wx/wxchar.h is included


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 7aff61182b..b87b204f8e 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -103,6 +103,33 @@
 /* check the consistency of the settings in setup.h */
 #include "wx/chkconf.h"
 
+/*
+   adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
+   and is used by wxWindows, _UNICODE and/or UNICODE may be defined or used by
+   the system headers so bring these settings in sync
+ */
+
+/* set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined */
+#if defined(_UNICODE) || defined(UNICODE)
+#   undef wxUSE_UNICODE
+#   define wxUSE_UNICODE 1
+#else /* !UNICODE */
+#   ifndef wxUSE_UNICODE
+#       define wxUSE_UNICODE 0
+#   endif
+#endif /* UNICODE/!UNICODE */
+
+/* and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1 */
+#if wxUSE_UNICODE
+#   ifndef _UNICODE
+#       define _UNICODE
+#   endif
+#   ifndef UNICODE
+#       define UNICODE
+#   endif
+#endif /* wxUSE_UNICODE */
+
+
 /*
    some compilers don't support iostream.h any longer, so override the users
    setting here in such case.
diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 6dadaecf49..4b95026c0c 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -16,33 +16,12 @@
     #pragma interface "wxchar.h"
 #endif
 
+#include "wx/defs.h"        // for wxUSE_UNICODE
+
 // ----------------------------------------------------------------------------
-// first deal with Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
-// and is used by wxWindows, _UNICODE and/or UNICODE may be defined or used by
-// the system headers so bring these settings in sync
+// check whether we have wchar_t and which size it is if we do
 // ----------------------------------------------------------------------------
 
-// set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined
-#if defined(_UNICODE) || defined(UNICODE)
-    #undef wxUSE_UNICODE
-    #define wxUSE_UNICODE 1
-#else
-    #ifndef wxUSE_UNICODE
-        #define wxUSE_UNICODE 0
-    #endif
-#endif // Unicode
-
-// and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1...
-#if wxUSE_UNICODE
-    #ifndef _UNICODE
-        #define _UNICODE
-    #endif
-    #ifndef UNICODE
-        #define UNICODE
-    #endif
-#endif // Unicode
-
-// check whether we have wchar_t
 #if !defined(wxUSE_WCHAR_T)
     #if defined(__WIN16__)
         // no wchar_t under Win16 regadrless of compiler used