Don't duplicate INVALID_FILE_ATTRIBUTES definition.

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

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 375f080b71acc9344cc788ff2c0bd8b8cc0783bb..eabc05bdf6e7ce1763c3a9168938bf8fab71b1c7 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -238,18 +238,24 @@
 /*
    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__
@@ -396,23 +402,20 @@
 #   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
 
-/*
-   Currently MSVC can't build the library with new-style events:
-    - VC6 simply doesn't have good enough templates support
-    - VC7 always seems to choos the Connect() overload using Functor, even when
-    the argument is a class method
-    - VC9 compiles the code fine but fails at linking stage in DLL build
- */
-#if !wxEVENTS_COMPATIBILITY_2_8
-#   if defined(__VISUALC__)
-#       undef wxEVENTS_COMPATIBILITY_2_8
-#       define wxEVENTS_COMPATIBILITY_2_8 1
-#   endif
-#endif
-
 #endif /* _WX_MSW_CHKCONF_H_ */