warning about standard controls

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index f96e30896c05e326f21ce7f7b424f45f9b2f3f9e..d6d4dd5a54be7d162df0ee3cfb8cf0d81753167c 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -18,8 +18,6 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_FONTMAP
-

 #include "wx/encconv.h"
 
 #include <stdlib.h>
 #include "wx/encconv.h"
 
 #include <stdlib.h>


@@ -38,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
 


@@ -206,7 +207,7 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 }
 
 
 }
 
 

-#define REPLACEMENT_CHAR  (tchar('?'))
+#define REPLACEMENT_CHAR  ((tchar)'?')

 
 inline tchar GetTableValue(const tchar *table, tchar value, bool& repl)
 {
 
 inline tchar GetTableValue(const tchar *table, tchar value, bool& repl)
 {


@@ -530,4 +531,3 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
     return arr;
 }
 
     return arr;
 }
 

-#endif // wxUSE_FONTMAP