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

define wxUSE_UNICODE before including wx/chkconf.h which uses it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-06-07 18:29:41 +00:00
parent 810ca88256
commit 79e7089470
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/platform.h
View File

@@ -259,9 +259,6 @@
*/ */
#include "wx/setup.h" #include "wx/setup.h"
/* check the consistency of the settings in setup.h */
#include "wx/chkconf.h"
/* /*
adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1 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 and is used by wxWidgets, _UNICODE and/or UNICODE may be defined or used by
@@ -292,6 +289,15 @@
// otherwise MSL headers bring in WIN32 dependant APIs // otherwise MSL headers bring in WIN32 dependant APIs
#undef UNICODE #undef UNICODE
#endif #endif
/*
check the consistency of the settings in setup.h: note that this must be
done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h
*/
#include "wx/chkconf.h"
/* /*
some compilers don't support iostream.h any longer, while some of theme some compilers don't support iostream.h any longer, while some of theme
are not updated with <iostream> yet, so override the users setting here are not updated with <iostream> yet, so override the users setting here