From 36a22fa34cc84a942d1c7982b37e0aa9928c2a11 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Jun 2005 00:05:56 +0000 Subject: [PATCH] removed check for wxUSE_UNICODE==1 if wxUSE_UNICODE_MSLU==1 as it makes it impossible to set wxUSE_UNICODE_MSLU to 1 in global wx/setup.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/chkconf.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 939fad0c66..8ae71dcf15 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -952,15 +952,6 @@ # endif #endif /* wxUSE_TEXTFILE */ -#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 */ - #if wxUSE_XML && !wxUSE_WCHAR_T # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_XML requires wxUSE_WCHAR_T" @@ -968,7 +959,7 @@ # undef wxUSE_XML # define wxUSE_XML 0 # endif -#endif /* wxUSE_UNICODE_MSLU */ +#endif /* wxUSE_XML */ #if !wxUSE_DYNLIB_CLASS # if wxUSE_DYNAMIC_LOADER -- 2.45.2