Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that SIZEOF_WCHAR_T is defined in wx/chartype.h

Browse Source 
This should always the case now, but wasn't when not using configure
(e.g. in MSVC builds) before, so verify this explicitly to ensure that
we don't just silently define wxUSE_UNICODE_UTF16 wrongly, as it
happened before the fix in the previous commit.
This commit is contained in:
Vadim Zeitlin
2017-06-21 19:08:27 +02:00
parent a86d0f8d65
commit 8311715bdf
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/chartype.h
View File

@@ -175,6 +175,10 @@
#define wxUSE_UTF8_LOCALE_ONLY 0 #define wxUSE_UTF8_LOCALE_ONLY 0
#endif #endif
#ifndef SIZEOF_WCHAR_T
#error "SIZEOF_WCHAR_T must be defined before including this file in wx/defs.h"
#endif
#if wxUSE_UNICODE_WCHAR && SIZEOF_WCHAR_T == 2 #if wxUSE_UNICODE_WCHAR && SIZEOF_WCHAR_T == 2
#define wxUSE_UNICODE_UTF16 1 #define wxUSE_UNICODE_UTF16 1
#else #else