X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/73302af6dddd667af4ebec69c800bc9de106f28e..030f50ef4af13a1a13f476e22e60616a3d20d75f:/src/common/fmapbase.cpp diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp index 759c7541eb..2358475b48 100644 --- a/src/common/fmapbase.cpp +++ b/src/common/fmapbase.cpp @@ -73,6 +73,7 @@ static wxFontEncoding gs_encodings[] = wxFONTENCODING_ISO8859_15, wxFONTENCODING_KOI8, wxFONTENCODING_KOI8_U, + wxFONTENCODING_CP874, wxFONTENCODING_CP932, wxFONTENCODING_CP936, wxFONTENCODING_CP949, @@ -117,6 +118,7 @@ static const wxChar* gs_encodingDescs[] = wxTRANSLATE( "Western European with Euro (ISO-8859-15)" ), wxTRANSLATE( "KOI8-R" ), wxTRANSLATE( "KOI8-U" ), + wxTRANSLATE( "Windows Thai (CP 874)" ), wxTRANSLATE( "Windows Japanese (CP 932)" ), wxTRANSLATE( "Windows Chinese Simplified (CP 936)" ), wxTRANSLATE( "Windows Korean (CP 949)" ), @@ -161,6 +163,7 @@ static const wxChar* gs_encodingNames[] = wxT( "iso-8859-15" ), wxT( "koi8-r" ), wxT( "koi8-u" ), + wxT( "windows-874" ), wxT( "windows-932" ), wxT( "windows-936" ), wxT( "windows-949" ), @@ -199,7 +202,7 @@ class wxFontMapperModule : public wxModule public: wxFontMapperModule() : wxModule() { } virtual bool OnInit() { return true; } - virtual void OnExit() { delete wxFontMapperBase::Set(NULL); } + virtual void OnExit() { delete (wxFontMapperBase*)wxFontMapperBase::Set(NULL); } DECLARE_DYNAMIC_CLASS(wxFontMapperModule) }; @@ -233,11 +236,10 @@ wxFontMapperBase::~wxFontMapperBase() #endif // wxUSE_CONFIG } +bool wxFontMapperBase::IsWxFontMapper() +{ return false; } + /* static */ -// Declared as returning wxFontMapper when wxUSE_GUI=1. Unfortunately, it's -// only implemented in wxBase library. Note that if the last resort -// is taken and GUI code tries to treat it as a real wxFontMapper -// then you'd be in trouble. wxFontMapperBase *wxFontMapperBase::Get() { if ( !sm_instance ) @@ -627,6 +629,10 @@ wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset) switch ( value ) { + case 874: + encoding = wxFONTENCODING_CP874; + break; + case 932: encoding = wxFONTENCODING_CP932; break;