don't do anything non trivial (like creating wxFontMapper) in ctors of global objects

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index fe7da61551e4e3ed8fb9ef303d658c66118dff92..2049b2d2247858fa0a6dd77690c62d0a55319e5b 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -331,6 +331,14 @@
 #   endif
 #endif /* !defined(wxUSE_DATAOBJ) */
 
+#ifndef wxUSE_DISPLAY
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DISPLAY must be defined."
+#   else
+#       define wxUSE_DISPLAY 0
+#   endif
+#endif /* !defined(wxUSE_DISPLAY) */
+
 #ifndef wxUSE_DOC_VIEW_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DOC_VIEW_ARCHITECTURE must be defined."
@@ -691,13 +699,13 @@
 #   endif
 #endif /* !defined(wxUSE_TREECTRL) */
 
-#ifndef wxUSE_DISPLAY
+#ifndef wxUSE_VALIDATORS
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_DISPLAY must be defined."
+#       error "wxUSE_VALIDATORS must be defined."
 #   else
-#       define wxUSE_DISPLAY 0
+#       define wxUSE_VALIDATORS 0
 #   endif
-#endif /* !defined(wxUSE_TREECTRL) */
+#endif /* !defined(wxUSE_VALIDATORS) */
 
 #ifndef wxUSE_WXHTML_HELP
 #   ifdef wxABORT_ON_CONFIG_ERROR