X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/149e70e1238c3bd7f425b2c58ca11513b0da59b4..fe79f76ba9aa2f89165481d7ed796f69df979875:/include/wx/chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 1ea7d95e19..35c988dbb8 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -108,9 +108,12 @@
 #   endif
 #endif /* !defined(wxUSE_FS_ARCHIVE) */
 
-/* don't give an error about this one yet, it's not fully implemented */
 #ifndef wxUSE_FSVOLUME
-#   define wxUSE_FSVOLUME 0
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_FSVOLUME must be defined."
+#   else
+#       define wxUSE_FSVOLUME 0
+#   endif
 #endif /* !defined(wxUSE_FSVOLUME) */
 
 #ifndef wxUSE_DYNAMIC_LOADER
@@ -129,6 +132,14 @@
 #   endif
 #endif /* !defined(wxUSE_INTL) */
 
+#ifndef wxUSE_IPV6
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_IPV6 must be defined."
+#   else
+#       define wxUSE_IPV6 0
+#   endif
+#endif /* !defined(wxUSE_IPV6) */
+
 #ifndef wxUSE_LOG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_LOG must be defined."
@@ -299,14 +310,6 @@
 #   endif
 #endif /* wxUSE_VARIANT */
 
-#ifndef wxUSE_WEAKREF
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_WEAKREF must be defined."
-#   else
-#       define wxUSE_WEAKREF 0
-#   endif
-#endif /* wxUSE_WEAKREF */
-
 #ifndef wxUSE_XLOCALE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XLOCALE must be defined."
@@ -641,7 +644,7 @@
 #endif /* !defined(wxUSE_HTML) */
 
 #ifndef wxUSE_LIBMSPACK
-#   ifndef __UNIX__
+#   if !defined(__UNIX__) || defined(__WXPALMOS__)
         /* set to 0 on platforms that don't have libmspack */
 #       define wxUSE_LIBMSPACK 0
 #   else
@@ -1030,8 +1033,10 @@
 #  include "wx/msw/chkconf.h"
 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"
+#elif defined(__WXCOCOA__)
+#  include "wx/cocoa/chkconf.h"
 #elif defined(__WXMAC__)
-#  include "wx/mac/chkconf.h"
+#  include "wx/osx/chkconf.h"
 #elif defined(__OS2__)
 #  include "wx/os2/chkconf.h"
 #elif defined(__WXMGL__)
@@ -1281,7 +1286,7 @@
  */
 #if wxUSE_GUI
 
-#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__)
+#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__) && !defined(__GCCXML__)
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_ACCESSIBILITY is currently only supported under wxMSW"
 #   else