# 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
+/*
+ * 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)
+
+// Only MSVC 7+ has gdiplus.h, add exceptions for other compilers here if they
+// can support it too (but notice that Borland currently dies in
+// src/msw/gdiplus.cpp with "macro expansion too long" error even if the header
+// is available)
+#if !wxCHECK_VISUALC_VERSION(7)
+ #undef wxUSE_GRAPHICS_CONTEXT
+ #define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+
+// 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__