diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index cd97372625..3ef7716a18 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -116,6 +116,7 @@ symbols, although this has not always been followed. @itemdef{__VMS__, VMS} @itemdef{__WINDOWS__, any Windows} @itemdef{__WINE__, Wine} +@itemdef{_WIN32_WCE, Windows CE version} @endDefList @@ -155,6 +156,7 @@ compiler used. to the compiler version: 500 is 5.0.} @itemdef{__DJGPP__, DJGPP} @itemdef{__DIGITALMARS__, Digital Mars} +@itemdef{__EVC4__, Embedded Visual C++ 4 (can be only used for building wxWinCE)} @itemdef{__GNUG__, Gnu C++ on any platform, see also wxCHECK_GCC_VERSION} @itemdef{__GNUWIN32__, Gnu-Win32 compiler, see also wxCHECK_W32API_VERSION} @itemdef{__MINGW32__, MinGW} @@ -172,7 +174,6 @@ compiler used. @itemdef{__XLC__, AIX compiler} @itemdef{__WATCOMC__, Watcom C++. The value of this macro corresponds to the compiler version, @c 1100 is @c 11.0 and @c 1200 is OpenWatcom.} -@itemdef{_WIN32_WCE, Windows CE version} @endDefList diff --git a/include/wx/msw/wince/chkconf.h b/include/wx/msw/wince/chkconf.h index 5a5ecc58d4..a15f394277 100644 --- a/include/wx/msw/wince/chkconf.h +++ b/include/wx/msw/wince/chkconf.h @@ -29,7 +29,7 @@ #endif // eVC doesn't have standard streams -#if !wxCHECK_VISUALC_VERSION(8) +#ifdef __EVC4__ #undef wxUSE_STD_IOSTREAM #define wxUSE_STD_IOSTREAM 0 #endif @@ -52,7 +52,7 @@ #define wxUSE_JOYSTICK 0 // libtiff doesn't build with eVC but is ok with VC8 -#if !wxCHECK_VISUALC_VERSION(8) +#ifdef __EVC4__ #undef wxUSE_LIBTIFF #define wxUSE_LIBTIFF 0 #endif @@ -90,7 +90,7 @@ #define wxUSE_PRINTING_ARCHITECTURE 0 // regex doesn't build with eVC but is ok with VC8 -#if !wxCHECK_VISUALC_VERSION(8) +#ifdef __EVC4__ #undef wxUSE_REGEX #define wxUSE_REGEX 0 #endif @@ -149,7 +149,7 @@ // eVC can't compile template Bind() but VC8 can #if !wxEVENTS_COMPATIBILITY_2_8 -# if !wxCHECK_VISUALC_VERSION(8) +# ifdef __EVC4__ # undef wxEVENTS_COMPATIBILITY_2_8 # define wxEVENTS_COMPATIBILITY_2_8 1 # endif diff --git a/include/wx/platform.h b/include/wx/platform.h index 51f7807b66..a1a2537981 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -233,6 +233,10 @@ # endif #endif +#if defined(__WXWINCE__) && defined(_MSC_VER) && (_MSC_VER == 1201) + #define __EVC4__ +#endif + #if defined(__POCKETPC__) || defined(__SMARTPHONE__) || defined(__WXGPE__) # define __WXHANDHELD__ #endif