From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 1 Jun 2003 12:46:22 +0000 (+0000)
Subject: Applied patch [ 746355 ] Adds some checks for chkconf.h
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/12491c1f8e34c6490bc3c619046c4ebc30a6900f

Applied patch [ 746355 ] Adds some checks for chkconf.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index b04e6f5209..644c7c7ada 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -675,6 +675,14 @@
 #   endif
 #endif /* !defined(wxUSE_TREECTRL) */
 
+#ifndef wxUSE_DISPLAY
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DISPLAY must be defined."
+#   else
+#       define wxUSE_DISPLAY 0
+#   endif
+#endif /* !defined(wxUSE_TREECTRL) */
+
 #ifndef wxUSE_WXHTML_HELP
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_WXHTML_HELP must be defined."
@@ -1140,6 +1148,26 @@
 #   endif
 #endif /* wxUSE_FILEDLG */
 
+#if !wxUSE_TOOLBAR
+#   if wxUSE_TOOLBAR_NATIVE
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_TOOLBAR is set to 0 but wxUSE_TOOLBAR_NATIVE is set to 1"
+#        else
+#            undef wxUSE_TOOLBAR_NATIVE
+#            define wxUSE_TOOLBAR_NATIVE 0
+#        endif
+#   endif
+
+#   if wxUSE_TOOLBAR_SIMPLE
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_TOOLBAR is set to 0 but wxUSE_TOOLBAR_SIMPLE is set to 1"
+#        else
+#            undef wxUSE_TOOLBAR_SIMPLE
+#            define wxUSE_TOOLBAR_SIMPLE 0
+#        endif
+#   endif
+#endif
+
 #if !wxUSE_IMAGLIST
 #   if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 0719c93098..f2bae0b7b7 100644
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -579,6 +579,14 @@
 // Recommended setting: 1 (can be safely set to 0, not used by the library)
 #define wxUSE_CARET         1
 
+// Use wxDisplay class: it allows enumerating all displays on a system and
+// working with them.
+//
+// Default is 0 because it isn't yet implemented on all platforms
+//
+// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
+#define wxUSE_DISPLAY       0
+
 // Miscellaneous geometry code: needed for Canvas library
 #define wxUSE_GEOMETRY            1