solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Always define wxUSE_UNICODE as 1

Browse source 
Remove the option allowing to set wxUSE_UNICODE to 0.
This commit is contained in:
Vadim Zeitlin 2022-10-27 01:04:15 +01:00
parent 9f0c2f67e8
commit 5d3e5ccf32
9 changed files with 16 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build/cmake/setup.h.in
View file

@ -148,11 +148,6 @@
#ifndef wxUSE_UNICODE
#cmakedefine01 wxUSE_UNICODE
#endif
#cmakedefine01 wxUSE_EXCEPTIONS
#cmakedefine01 wxUSE_EXTENDED_RTTI

12
include/wx/android/setup.h
View file

@ -180,18 +180,6 @@
#define wxUSE_DEBUG_NEW_ALWAYS 0
// ----------------------------------------------------------------------------
// Unicode support
// ----------------------------------------------------------------------------
// This option is deprecated: the library should be 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 1
#endif
// ----------------------------------------------------------------------------
// global features
// ----------------------------------------------------------------------------

12
include/wx/gtk/setup.h
View file

@ -181,18 +181,6 @@
#define wxUSE_DEBUG_NEW_ALWAYS 0
// ----------------------------------------------------------------------------
// Unicode support
// ----------------------------------------------------------------------------
// This option is deprecated: the library should be 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 1
#endif
// ----------------------------------------------------------------------------
// global features
// ----------------------------------------------------------------------------

12
include/wx/msw/setup.h
View file

@ -181,18 +181,6 @@
#define wxUSE_DEBUG_NEW_ALWAYS 0
// ----------------------------------------------------------------------------
// Unicode support
// ----------------------------------------------------------------------------
// This option is deprecated: the library should be 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 1
#endif
// ----------------------------------------------------------------------------
// global features
// ----------------------------------------------------------------------------

12
include/wx/osx/setup.h
View file

@ -187,18 +187,6 @@
#define wxUSE_DEBUG_NEW_ALWAYS 0
// ----------------------------------------------------------------------------
// Unicode support
// ----------------------------------------------------------------------------
// This option is deprecated: the library should be 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 1
#endif
// ----------------------------------------------------------------------------
// global features
// ----------------------------------------------------------------------------

36
include/wx/platform.h
View file

@ -197,30 +197,26 @@
/*
adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
and is used by wxWidgets, _UNICODE and/or UNICODE may be defined or used by
the system headers so bring these settings in sync
Always define wxUSE_UNICODE as 1 for compatibility.
Additionally, define _UNICODE and UNICODE too: this is used by MSW SDK/CRT
headers and also may be used by wx applications code.
*/
/* set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined */
#if defined(_UNICODE) || defined(UNICODE)
# undef wxUSE_UNICODE
#ifdef wxUSE_UNICODE
# if wxUSE_UNICODE != 1
# error "wxUSE_UNICODE may be only defined as 1"
# endif
#else
# define wxUSE_UNICODE 1
#else /* !UNICODE */
# ifndef wxUSE_UNICODE
# define wxUSE_UNICODE 0
# endif
#endif /* UNICODE/!UNICODE */
#endif
/* 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 */
#ifndef _UNICODE
# define _UNICODE
#endif
#ifndef UNICODE
# define UNICODE
#endif

12
include/wx/setup_inc.h
View file

@ -177,18 +177,6 @@
#define wxUSE_DEBUG_NEW_ALWAYS 0
// ----------------------------------------------------------------------------
// Unicode support
// ----------------------------------------------------------------------------
// This option is deprecated: the library should be 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 1
#endif
// ----------------------------------------------------------------------------
// global features
// ----------------------------------------------------------------------------

12
include/wx/univ/setup.h
View file

@ -180,18 +180,6 @@
#define wxUSE_DEBUG_NEW_ALWAYS 0
// ----------------------------------------------------------------------------
// Unicode support
// ----------------------------------------------------------------------------
// This option is deprecated: the library should be 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 1
#endif
// ----------------------------------------------------------------------------
// global features
// ----------------------------------------------------------------------------

5
setup.h.in
View file

@ -151,11 +151,6 @@
#ifndef wxUSE_UNICODE
#define wxUSE_UNICODE 0
#endif
#define wxUSE_EXCEPTIONS 0
#define wxUSE_EXTENDED_RTTI 0