don't translate Win32 structured exceptions into C++ ones (requires always using...

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index f96e30896c05e326f21ce7f7b424f45f9b2f3f9e..ac467d90d873a7ef4933c2bac78d97578c208f12 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -18,8 +18,6 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_FONTMAP
-
 #include "wx/encconv.h"
 
 #include <stdlib.h>
@@ -206,7 +204,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)
 {
@@ -530,4 +528,3 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
     return arr;
 }
 
-#endif // wxUSE_FONTMAP