# endif
#endif /* !defined(wxUSE_MS_HTML_HELP) */
+#ifndef wxUSE_INICONF
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_INICONF must be defined."
+# else
+# define wxUSE_INICONF 0
+# endif
+#endif /* !defined(wxUSE_INICONF) */
+
#ifndef wxUSE_OLE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_OLE must be defined."
# endif
#endif /* !defined(wxUSE_OLE_AUTOMATION) */
+#ifndef wxUSE_TASKBARICON_BALLOONS
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_TASKBARICON_BALLOONS must be defined."
+# else
+# define wxUSE_TASKBARICON_BALLOONS 0
+# endif
+#endif /* wxUSE_TASKBARICON_BALLOONS */
+
#ifndef wxUSE_UNICODE_MSLU
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_UNICODE_MSLU must be defined."
# endif
#endif /* wxUSE_UXTHEME */
-#ifndef wxUSE_UXTHEME_AUTO
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_UXTHEME_AUTO must be defined."
-# else
-# define wxUSE_UXTHEME_AUTO 0
-# endif
-#endif /* wxUSE_UXTHEME_AUTO */
-
/*
* We don't want to give an error if wxUSE_UNICODE_MSLU is enabled but
* wxUSE_UNICODE is not as this would make it impossible to simply set the
# endif
#endif
+/*
+ * See WINVER definition in wx/msw/wrapwin.h for the explanation of this test
+ * logic.
+ */
+#if (defined(__VISUALC__) && (__VISUALC__ < 1300)) && \
+ (!defined(WINVER) || WINVER < 0x0500)
+# undef wxUSE_TASKBARICON_BALLOONS
+# define wxUSE_TASKBARICON_BALLOONS 0
+#endif
+
/*
* All of the settings below require SEH support (__try/__catch) and can't work
* without it.
/*
Compiler-specific checks.
*/
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
+
+/* Borland */
+#ifdef __BORLANDC__
+
+#if __BORLANDC__ < 0x500
/* BC++ 4.0 can't compile JPEG library */
# undef wxUSE_LIBJPEG
# define wxUSE_LIBJPEG 0
#endif
/* wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode */
-#if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL))
+#if defined(WXMAKINGDLL) || defined(WXUSINGDLL)
# undef wxUSE_DEBUG_NEW_ALWAYS
# define wxUSE_DEBUG_NEW_ALWAYS 0
#endif
+#endif /* __BORLANDC__ */
+
/* DMC++ doesn't have definitions for date picker control, so use generic control
*/
#ifdef __DMC__
#endif /* !wxUSE_DYNAMIC_LOADER */
#if !wxUSE_DYNLIB_CLASS
+# if wxUSE_DC_TRANSFORM_MATRIX
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_DC_TRANSFORM_MATRIX requires wxUSE_DYNLIB_CLASS"
+# else
+# undef wxUSE_DC_TRANSFORM_MATRIX
+# define wxUSE_DC_TRANSFORM_MATRIX 0
+# endif
+# endif
# if wxUSE_UXTHEME
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_UXTHEME requires wxUSE_DYNLIB_CLASS"
# 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
+# if wxUSE_FSWATCHER
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxFileSystemWatcher requires wxThread under MSW"
+# else
+# undef wxUSE_FSWATCHER
+# define wxUSE_FSWATCHER 0
+# endif
+# 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