using the cf string conversions exclusively

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

diff --git a/include/wx/mac/carbon/config_xcode.h b/include/wx/mac/carbon/config_xcode.h
index 369163b8e85e402d26a31b43455a8d4a0787cc62..b9468165b05f4270b5c8af58c933eadc88cff1d0 100644 (file)
--- a/include/wx/mac/carbon/config_xcode.h
+++ b/include/wx/mac/carbon/config_xcode.h
@@ -88,7 +88,8 @@
 #define HAVE_SCHED_H 1
 #define HAVE_UNISTD_H 1
 #define HAVE_WCHAR_H 1
 #define HAVE_SCHED_H 1
 #define HAVE_UNISTD_H 1
 #define HAVE_WCHAR_H 1

-#define HAVE_ICONV 1
+/* better to use the built-in CF conversions, also avoid iconv versioning problems */
+/* #undef HAVE_ICONV */

 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
 #define ICONV_CONST const
 #else
 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
 #define ICONV_CONST const
 #else