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

Move the #if disabling wxUSE_STD_STRING for watcom/dmc/vc5 into setup.h so

Browse Source 
that users can edit them easily.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-11-08 00:09:15 +00:00
parent 693bfcafb6
commit 8bb9d852a3
10 changed files with 128 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/string.h
View File

@@ -169,17 +169,6 @@ inline int Stricmp(const char *psz1, const char *psz2)
// deal with STL/non-STL/non-STL-but-wxUSE_STD_STRING
// ----------------------------------------------------------------------------
#if wxUSE_STL || wxUSE_STD_STRING
// these compilers come without standard C++ library headers by default,
// remove the tests here if you do have them (e.g. from STLPort)
#if defined(__DMC__) || defined(__WATCOMC__)
#undef wxUSE_STL
#undef wxUSE_STD_STRING
#define wxUSE_STL 0
#define wxUSE_STD_STRING 0
#endif
#endif // wxUSE_STL || wxUSE_STD_STRING
// in both cases we need to define wxStdString
#if wxUSE_STL || wxUSE_STD_STRING