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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 1ea7d95e19..5ba0f6c5d2 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -299,14 +299,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 +633,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 +1022,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__)