don't define min/max macros in windows.h (closes 1052256)

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index fbccbd0be4e8199e6d7d580781c3d603b37c88dc..361ba6b5394ac162e551e0b588e71e3e5b9f74b4 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -40,6 +40,21 @@
 #   define wxUSE_GUI 1
 #endif /* !defined(wxUSE_GUI) */
 
+/*
+    If we're compiling without support for threads/exceptions we have to
+    disable the corresponding features.
+ */
+#ifdef wxNO_THREADS
+#   undef wxUSE_THREADS
+#   define wxUSE_THREADS 0
+#endif /* wxNO_THREADS */
+
+#ifdef wxNO_EXCEPTIONS
+#   undef wxUSE_EXCEPTIONS
+#   define wxUSE_EXCEPTIONS 0
+#endif /* wxNO_EXCEPTIONS */
+
+
 /*
    tests for non GUI features
  */
@@ -1645,5 +1660,14 @@
 #   endif
 #endif /* wxUSE_XRC */
 
+#if wxUSE_SOCKETS && !wxUSE_STOPWATCH
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_SOCKETS requires wxUSE_STOPWATCH"
+#   else
+#       undef wxUSE_SOCKETS
+#       define wxUSE_SOCKETS 0
+#   endif
+#endif /* wxUSE_SOCKETS */
+
 #endif /* wxUSE_GUI */