safety check for wxUSE_UNICODE and wxUSE_UNICODE_MSLU
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -533,6 +533,22 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* !defined(wxUSE_WXHTML_HELP) */
|
#endif /* !defined(wxUSE_WXHTML_HELP) */
|
||||||
|
|
||||||
|
#ifndef wxUSE_UNICODE
|
||||||
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
# error "wxUSE_UNICODE must be defined."
|
||||||
|
# else
|
||||||
|
# define wxUSE_UNICODE 0
|
||||||
|
# endif
|
||||||
|
#endif /* !defined(wxUSE_UNICODE) */
|
||||||
|
|
||||||
|
#if defined(__WXMSW__) && !defined(wxUSE_UNICODE_MSLU)
|
||||||
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
# error "wxUSE_UNICODE_MSLU must be defined."
|
||||||
|
# else
|
||||||
|
# define wxUSE_UNICODE_MSLU 0
|
||||||
|
# endif
|
||||||
|
#endif /* !defined(wxUSE_UNICODE) */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
check consistency of the settings
|
check consistency of the settings
|
||||||
*/
|
*/
|
||||||
@@ -877,5 +893,14 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* wxUSE_CLIPBOARD */
|
#endif /* wxUSE_CLIPBOARD */
|
||||||
|
|
||||||
|
#if wxUSE_UNICODE_MSLU && !wxUSE_UNICODE
|
||||||
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
# error "wxUSE_UNICODE_MSLU requires wxUSE_UNICODE"
|
||||||
|
# else
|
||||||
|
# undef wxUSE_UNICODE
|
||||||
|
# define wxUSE_UNICODE 1
|
||||||
|
# endif
|
||||||
|
#endif /* wxUSE_UNICODE_MSLU */
|
||||||
|
|
||||||
#endif /* wxUSE_GUI */
|
#endif /* wxUSE_GUI */
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user