X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07b1232d2c3de105855c17a46e4285547a1c736f..821baf7da4a57028eaa17830b6195056216b71f9:/include/wx/msw/chkconf.h

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index b5f92e375c..375f080b71 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -55,6 +55,14 @@
 #    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."
@@ -71,6 +79,14 @@
 #    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."
@@ -87,14 +103,6 @@
 #    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
@@ -121,6 +129,16 @@
 #   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.
@@ -383,4 +401,18 @@
 #   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_ */