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

silently ignore wxUSE_UNICODE_MSLU in non-Unicode builds (see also rev 1.106 of wx/chkconf.h)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-06-07 12:28:31 +00:00
parent 24fec90857
commit 820a7a1b22
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/msw/chkconf.h
View File

@@ -34,6 +34,18 @@
# endif # endif
#endif #endif
/*
* We don't want to give an error if wxUSE_UNICODE_MSLU is enabled but
* wxUSE_UNICODE is not as this would make it impossible to simply set the
* former in wx/setup.h as then the library wouldn't compile in non-Unicode
* configurations, so instead simply unset it silently when it doesn't make
* sense.
*/
#if wxUSE_UNICODE_MSLU && !wxUSE_UNICODE
# undef wxUSE_UNICODE_MSLU
# define wxUSE_UNICODE_MSLU 0
#endif
/* /*
* All of the settings below require SEH support (__try/__catch) and can't work * All of the settings below require SEH support (__try/__catch) and can't work
* without it. * without it.
@@ -128,7 +140,6 @@
/* DMC++ doesn't have definitions for date picker control, so use generic control /* DMC++ doesn't have definitions for date picker control, so use generic control
*/ */
#ifdef __DMC__ #ifdef __DMC__
# if wxUSE_DATEPICKCTRL # if wxUSE_DATEPICKCTRL
# undef wxUSE_DATEPICKCTRL_GENERIC # undef wxUSE_DATEPICKCTRL_GENERIC