X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b412d238281008e248bcdebeae4baf4b67191e7..02bcd285fac7124a41292d905609220005f51087:/src/common/encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index ac467d90d8..267b96b8e9 100644
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "encconv.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -36,10 +32,13 @@
 #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