Allow more than one timer with the same ID. Closes #11699.

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 4afa892e073ba0bebf081ff05abe1907c090e710..eb67a29a56968c82bd4dbd48eac1c6744fb1e2ff 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -49,7 +49,7 @@
    this global setting determines what should we do if the setting FOO
    requires BAR and BAR is not set: we can either silently unset FOO as well
    (do this if you're trying to build the smallest possible library) or give an
-   error and abort (default as leads to least surprizing behaviour)
+   error and abort (default as leads to least surprising behaviour)
  */
 #define wxABORT_ON_CONFIG_ERROR
 
@@ -431,6 +431,18 @@
 #   endif
 #endif /* !defined(wxUSE_BUTTON) */
 
+/*
+    This one is special, it's only used under wxGTK currently so don't require
+    pre-defining it.
+ */
+#ifndef wxUSE_CAIRO
+#   ifdef __WXGTK210__
+#        define wxUSE_CAIRO 1
+#    else
+#        define wxUSE_CAIRO 0
+#    endif
+#endif
+
 #ifndef wxUSE_CALENDARCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_CALENDARCTRL must be defined, please read comment near the top of this file."