Move msw configuration checking to chkconf.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 5643870029123b1a65f06f9c275e3a98641388fd..90518a77ae9dbd5b6c323778fa8db9f4d142a2b5 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -408,6 +408,14 @@
 #           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
@@ -421,6 +429,18 @@
 #   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

diff --git a/include/wx/msw/webviewie.h b/include/wx/msw/webviewie.h
index c0045b43a821c44fdc0beabbda9907dde1783a98..f3954c2eaa3cb27e33f5855a60107ea7c3a7492b 100644 (file)
--- a/include/wx/msw/webviewie.h
+++ b/include/wx/msw/webviewie.h
@@ -19,17 +19,6 @@
 #include "wx/msw/ole/automtn.h"
 #include "wx/msw/ole/activex.h"
 
-// TODO: move this to wx/msw/chkconf.h
-#if wxUSE_ACTIVEX != 1
-#error "wxUSE_ACTIVEX must be activated for this to work"
-#endif
-
-#if wxUSE_OLE_AUTOMATION != 1
-#error "wxUSE_OLE_AUTOMATION must be activated for this to work"
-#endif
-
-// FIXME: get those DLL export macros right...
-
 class WXDLLIMPEXP_WEB wxWebViewIE : public wxWebView
 {
 public: