-#ifndef wxUSE_DIALUP_MANAGER
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_DIALUP_MANAGER must be defined."
-# else
-# define wxUSE_DIALUP_MANAGER 0
-# endif
-#endif /* !defined(wxUSE_DIALUP_MANAGER) */
+
+/* check settings consistency for MSW-specific ones */
+#if wxUSE_CRASHREPORT && !wxUSE_ON_FATAL_EXCEPTION
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION"
+# else
+# undef wxUSE_CRASHREPORT
+# define wxUSE_CRASHREPORT 0
+# endif
+#endif /* wxUSE_CRASHREPORT */
+
+#if !wxUSE_VARIANT
+# if wxUSE_ACTIVEX
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxActiveXContainer requires wxVariant"
+# else
+# undef wxUSE_ACTIVEX
+# define wxUSE_ACTIVEX 0
+# endif
+# endif
+
+# if wxUSE_OLE_AUTOMATION
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxAutomationObject requires wxVariant"
+# else
+# undef wxUSE_OLE_AUTOMATION
+# define wxUSE_OLE_AUTOMATION 0
+# endif
+# endif
+#endif /* !wxUSE_VARIANT */