X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02c92ad972ebc51001dddfd930e6811ab7901483..d23ec02c6ab52f60349601be999bab4cf6acbdc4:/src/common/encconv.cpp diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp index f96e30896c..a44449dc0d 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" @@ -18,8 +14,6 @@ #pragma hdrstop #endif -#if wxUSE_FONTMAP - #include "wx/encconv.h" #include @@ -38,10 +32,13 @@ #endif #ifdef __WXMAC__ - #include - #include - #include - +#ifdef __DARWIN__ +#include +#else +#include +#include +#include +#endif #include "wx/fontutil.h" #include "wx/mac/private.h" // includes mac headers @@ -206,7 +203,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) { @@ -472,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; @@ -530,4 +527,3 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc) return arr; } -#endif // wxUSE_FONTMAP