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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-22 21:24:16 +00:00
parent 753287c1fd
commit 63e7198ba8
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/wx/platform.h
View File

@@ -103,6 +103,33 @@
/* check the consistency of the settings in setup.h */ /* check the consistency of the settings in setup.h */
#include "wx/chkconf.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 some compilers don't support iostream.h any longer, so override the users
setting here in such case. setting here in such case.

27
include/wx/wxchar.h
View File

@@ -16,33 +16,12 @@
#pragma interface "wxchar.h" #pragma interface "wxchar.h"
#endif #endif
#include "wx/defs.h" // for wxUSE_UNICODE
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// first deal with Unicode setting: wxUSE_UNICODE should be defined as 0 or 1 // check whether we have wchar_t and which size it is if we do
// 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
#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(wxUSE_WCHAR_T)
#if defined(__WIN16__) #if defined(__WIN16__)
// no wchar_t under Win16 regadrless of compiler used // no wchar_t under Win16 regadrless of compiler used