diff options
| author | Bernard Normier <bernard@zeroc.com> | 2010-05-13 11:50:03 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2010-05-13 11:50:03 -0400 |
| commit | 700eed3207129c277c245fec9fdebfa099a0f77e (patch) | |
| tree | 16dc801d327c8c9e27066f007745a09d73dbb8c0 /cpp/demo/IcePatch2/MFC/stdafx.h | |
| parent | bug 4725 - generate one shot constructor for structs (diff) | |
| download | ice-700eed3207129c277c245fec9fdebfa099a0f77e.tar.bz2 ice-700eed3207129c277c245fec9fdebfa099a0f77e.tar.xz ice-700eed3207129c277c245fec9fdebfa099a0f77e.zip | |
Squashed commit of the following:
commit f25399b006e5b15b46e4258546d80e1d006e1bc1
Author: U-bwin7\bernard <bernard@bwin7.(none)>
Date: Thu May 13 11:41:01 2010 -0400
VS2010 port
Diffstat (limited to 'cpp/demo/IcePatch2/MFC/stdafx.h')
| -rwxr-xr-x[-rw-r--r--] | cpp/demo/IcePatch2/MFC/stdafx.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/demo/IcePatch2/MFC/stdafx.h b/cpp/demo/IcePatch2/MFC/stdafx.h index 1112d4eaa13..7126aebe7ef 100644..100755 --- a/cpp/demo/IcePatch2/MFC/stdafx.h +++ b/cpp/demo/IcePatch2/MFC/stdafx.h @@ -33,13 +33,19 @@ #endif #ifndef WINVER -# if defined(_MSC_VER) && _MSC_VER > 1300 +# if defined(_MSC_VER) && _MSC_VER > 1300 && _MSC_VER < 1600 # define WINVER 0x0400 +# elif defined(_MSC_VER) && _MSC_VER >=1600 + # define WINVER 0x0501 # endif #endif #ifndef _WIN32_IE // Allow use of features specific to IE 4.0 or later. -#define _WIN32_IE 0x0400 // Change this to the appropriate value to target IE 5.0 or later. +# if defined(_MSC_VER) && _MSC_VER >=1600 +# define _WIN32_IE 0x0500 // Change this to the appropriate value to target IE 5.0 or later. +# else +# define _WIN32_IE 0x0400 +# endif #endif #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit |