Avoid CRT deprecation warnings for MSVC build using makefiles too.

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

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 5643870029123b1a65f06f9c275e3a98641388fd..03672e924dec40ae95778ee04efe7498ce037558 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -224,11 +224,6 @@
  */
 #ifdef __WIN64__
 #   if wxUSE_STACKWALKER
  */
 #ifdef __WIN64__
 #   if wxUSE_STACKWALKER

-        /* this is not currently supported under Win64, volunteers needed to
-           make it work */
-#       undef wxUSE_STACKWALKER
-#       define wxUSE_STACKWALKER 0
-

 #       undef wxUSE_CRASHREPORT
 #       define wxUSE_CRASHREPORT 0
 #   endif
 #       undef wxUSE_CRASHREPORT
 #       define wxUSE_CRASHREPORT 0
 #   endif


@@ -408,6 +403,14 @@
 #           define wxUSE_MEDIACTRL 0
 #       endif
 #   endif
 #           define wxUSE_MEDIACTRL 0
 #       endif
 #   endif

+#    if wxUSE_WEB
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxWebView requires wxActiveXContainer under MSW"
+#       else
+#           undef wxUSE_WEB
+#           define wxUSE_WEB 0
+#       endif
+#   endif

 #endif /* !wxUSE_ACTIVEX */
 
 #if !wxUSE_THREADS
 #endif /* !wxUSE_ACTIVEX */
 
 #if !wxUSE_THREADS


@@ -421,6 +424,18 @@
 #   endif
 #endif /* !wxUSE_THREADS */
 
 #   endif
 #endif /* !wxUSE_THREADS */
 

+
+#if !wxUSE_OLE_AUTOMATION
+#    if wxUSE_WEB
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxWebView requires wxUSE_OLE_AUTOMATION under MSW"
+#       else
+#           undef wxUSE_WEB
+#           define wxUSE_WEB 0
+#       endif
+#   endif
+#endif /* !wxUSE_OLE_AUTOMATION */
+

 #if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
 #   undef wxUSE_POSTSCRIPT
 #   define wxUSE_POSTSCRIPT 1
 #if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
 #   undef wxUSE_POSTSCRIPT
 #   define wxUSE_POSTSCRIPT 1