warning about standard controls

[wxWidgets.git] / src / common / encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index ac467d90d873a7ef4933c2bac78d97578c208f12..d6d4dd5a54be7d162df0ee3cfb8cf0d81753167c 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -36,10 +36,13 @@
 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

-    #include <ATSUnicode.h>
-    #include <TextCommon.h>
-    #include <TextEncodingConverter.h>
-
+#ifdef __DARWIN__
+#include <Carbon/Carbon.h>
+#else
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>
+#endif

     #include "wx/fontutil.h"
     #include "wx/mac/private.h"  // includes mac headers
 
     #include "wx/fontutil.h"
     #include "wx/mac/private.h"  // includes mac headers