changed return type of RGBColor to const Reference (avoiding compiler warnings)

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 4c78f72c44722b1a72d4bc19be4b3b018b4e93ac..a9a252e60a1293c83075de92357f9edadf366770 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -469,6 +469,14 @@
 #   endif
 #endif /* !defined(wxUSE_TAB_DIALOG) */
 
+#ifndef wxUSE_TEXTBUFFER
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TEXTBUFFER must be defined."
+#   else
+#       define wxUSE_TEXTBUFFER 0
+#   endif
+#endif /* !defined(wxUSE_TEXTBUFFER) */
+
 #ifndef wxUSE_TEXTCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TEXTCTRL must be defined."
@@ -477,6 +485,22 @@
 #   endif
 #endif /* !defined(wxUSE_TEXTCTRL) */
 
+#ifndef wxUSE_TEXTFILE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TEXTFILE must be defined."
+#   else
+#       define wxUSE_TEXTFILE 0
+#   endif
+#endif /* !defined(wxUSE_TEXTFILE) */
+
+#ifndef wxUSE_TIPWINDOW
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TIPWINDOW must be defined."
+#   else
+#       define wxUSE_TIPWINDOW 0
+#   endif
+#endif /* !defined(wxUSE_TIPWINDOW) */
+
 #ifndef wxUSE_TOOLBAR
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TOOLBAR must be defined."
@@ -509,6 +533,22 @@
 #   endif
 #endif /* !defined(wxUSE_WXHTML_HELP) */
 
+#ifndef wxUSE_UNICODE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_UNICODE must be defined."
+#   else
+#       define wxUSE_UNICODE 0
+#   endif
+#endif /* !defined(wxUSE_UNICODE) */
+
+#if defined(__WXMSW__) && !defined(wxUSE_UNICODE_MSLU)
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_UNICODE_MSLU must be defined."
+#   else
+#       define wxUSE_UNICODE_MSLU 0
+#   endif
+#endif /* !defined(wxUSE_UNICODE) */
+
 /*
    check consistency of the settings
  */
@@ -826,6 +866,15 @@
 #   endif
 #endif /* wxUSE_MIMETYPE */
 
+#if wxUSE_TEXTFILE && !wxUSE_TEXTBUFFER
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TEXTFILE requires wxUSE_TEXTBUFFER"
+#   else
+#       undef wxUSE_TEXTBUFFER
+#       define wxUSE_TEXTBUFFER 1
+#   endif
+#endif /* wxUSE_TEXTFILE */
+
 #if wxUSE_TEXTFILE && !wxUSE_FILE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TEXTFILE requires wxUSE_FILE"
@@ -844,5 +893,14 @@
 #   endif
 #endif /* wxUSE_CLIPBOARD */
 
+#if wxUSE_UNICODE_MSLU && !wxUSE_UNICODE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_UNICODE_MSLU requires wxUSE_UNICODE"
+#   else
+#       undef wxUSE_UNICODE
+#       define wxUSE_UNICODE 1
+#   endif
+#endif /* wxUSE_UNICODE_MSLU */
+
 #endif /* wxUSE_GUI */