wxControl::SetLabel no longer strips out codes so do it here

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index ac467d90d873a7ef4933c2bac78d97578c208f12..a44449dc0d744a516082f79f767c0b3bbbcc888e 100644 (file)
--- 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
 
@@ -470,7 +469,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
         platform = wxPLATFORM_WINDOWS;
 #elif defined(__WXGTK__) || defined(__WXMOTIF__)
         platform = wxPLATFORM_UNIX;
-#elif defined(__WXOS2__)
+#elif defined(__WXPM__)
         platform = wxPLATFORM_OS2;
 #elif defined(__WXMAC__)
         platform = wxPLATFORM_MAC;