/*
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"
# 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 defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
# undef wxUSE_POSTSCRIPT
# define wxUSE_POSTSCRIPT 1
#endif
-/* VC6 can't handle the templates for the 'type safe events': */
-#if !wxEVENTS_COMPATIBILITY_2_8
-# ifdef __VISUALC6__
-# undef wxEVENTS_COMPATIBILITY_2_8
-# define wxEVENTS_COMPATIBILITY_2_8 1
-# endif
-#endif
-
#endif /* _WX_MSW_CHKCONF_H_ */