X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..d9b4ddf28fbf20fe28d20c72b37c85a8e2db686e:/include/wx/chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index f6b3916ad2..c8b3080280 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -11,6 +11,16 @@
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
+/*
+   Compiler-specific checking.
+ */
+
+#if defined(__WXMSW__)
+#  include "wx/msw/chkconf.h"
+#elif defined(__WXMAC__)
+#  include "wx/mac/chkconf.h"
+#endif
+
 /*
    this global setting determines what should we do if the setting FOO
    requires BAR and BAR is not set: we can either silently define BAR
@@ -95,14 +105,6 @@
 #   endif
 #endif /* !defined(wxUSE_MIMETYPE) */
 
-#ifndef wxUSE_PROLOGIO
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_PROLOGIO must be defined."
-#   else
-#       define wxUSE_PROLOGIO 0
-#   endif
-#endif /* !defined(wxUSE_PROLOGIO) */
-
 #ifndef wxUSE_PROTOCOL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_PROTOCOL must be defined."
@@ -483,14 +485,6 @@
 #   endif
 #endif /* !defined(wxUSE_MSGDLG) */
 
-#ifndef wxUSE_NEW_GRID
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_NEW_GRID must be defined."
-#   else
-#       define wxUSE_NEW_GRID 0
-#   endif
-#endif /* !defined(wxUSE_NEW_GRID) */
-
 #ifndef wxUSE_NOTEBOOK
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_NOTEBOOK must be defined."
@@ -683,13 +677,13 @@
 #   endif
 #endif /* !defined(wxUSE_TREECTRL) */
 
-#ifndef wxUSE_WX_RESOURCES
+#ifndef wxUSE_DISPLAY
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_WX_RESOURCES must be defined."
+#       error "wxUSE_DISPLAY must be defined."
 #   else
-#       define wxUSE_WX_RESOURCES 0
+#       define wxUSE_DISPLAY 0
 #   endif
-#endif /* !defined(wxUSE_WX_RESOURCES) */
+#endif /* !defined(wxUSE_TREECTRL) */
 
 #ifndef wxUSE_WXHTML_HELP
 #   ifdef wxABORT_ON_CONFIG_ERROR
@@ -772,6 +766,17 @@
 #   endif
 #endif /* wxUSE_FILESYSTEM */
 
+#if wxUSE_FS_INET
+#   if !wxUSE_PROTOCOL
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_FS_INET requires wxUSE_PROTOCOL"
+#       else
+#           undef wxUSE_PROTOCOL
+#           define wxUSE_PROTOCOL 1
+#       endif
+#   endif
+#endif /* wxUSE_FS_INET */
+
 #if wxUSE_STOPWATCH || wxUSE_DATETIME
 #    if !wxUSE_LONGLONG
 #        ifdef wxABORT_ON_CONFIG_ERROR
@@ -842,7 +847,6 @@
     wxUSE_CHOICE || \
     wxUSE_GAUGE || \
     wxUSE_GRID || \
-    wxUSE_NEW_GRID || \
     wxUSE_LISTBOX || \
     wxUSE_LISTCTRL || \
     wxUSE_NOTEBOOK || \
@@ -991,6 +995,18 @@
 #   endif  /* wxUSE_DYNAMIC_LOADER */
 #endif /* wxMSW */
 
+/* wxMAC-specific dependencies */
+#ifdef __WXMAC__
+#   if wxUSE_UNICODE
+#       if !TARGET_CARBON
+#           ifdef wxABORT_ON_CONFIG_ERROR
+#               error "wxUSE_UNICODE is only supported for Carbon Targets."
+#           else
+#               define wxUSE_UNICODE 0
+#           endif
+#       endif
+#   endif
+#endif /* wxMAC */
 /* wxMotif-specific dependencies */
 #if defined(__WXMOTIF__) && wxUSE_NOTEBOOK && !wxUSE_TAB_DIALOG
 #  undef wxUSE_TAB_DIALOG
@@ -1144,6 +1160,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