added Thai/CP874 support for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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" ),
|
||||
@@ -626,6 +629,10 @@ wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset)
|
||||
|
||||
switch ( value )
|
||||
{
|
||||
case 874:
|
||||
encoding = wxFONTENCODING_CP874;
|
||||
break;
|
||||
|
||||
case 932:
|
||||
encoding = wxFONTENCODING_CP932;
|
||||
break;
|
||||
|
Reference in New Issue
Block a user