Rebake trunk after wxWebView merge and add missing project files for the wxWebView...

[wxWidgets.git] / include / wx / msw / wince / chkconf.h

diff --git a/include/wx/msw/wince/chkconf.h b/include/wx/msw/wince/chkconf.h
index 5a5ecc58d4ead267c4593c7148c079b9e9c2959a..fc9ce49670a0b8bf1699d90b58913de03cab8988 100644 (file)
--- 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
 #endif
 
 // eVC doesn't have standard streams

-#if !wxCHECK_VISUALC_VERSION(8)
+#ifdef __EVC4__

     #undef wxUSE_STD_IOSTREAM
     #define wxUSE_STD_IOSTREAM 0
 #endif
     #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
 #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
     #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
 #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
     #undef wxUSE_REGEX
     #define wxUSE_REGEX 0
 #endif


@@ -147,13 +147,5 @@
     #define wxUSE_COLOURDLG 0
 #endif // __SMARTPHONE__
 
     #define wxUSE_COLOURDLG 0
 #endif // __SMARTPHONE__
 

-// eVC can't compile template Bind() but VC8 can
-#if !wxEVENTS_COMPATIBILITY_2_8
-#   if !wxCHECK_VISUALC_VERSION(8)
-#       undef wxEVENTS_COMPATIBILITY_2_8
-#       define wxEVENTS_COMPATIBILITY_2_8 1
-#   endif
-#endif
-

 #endif // _WX_MSW_WINCE_CHKCONF_H_
 
 #endif // _WX_MSW_WINCE_CHKCONF_H_