diff --git a/docs/changes.txt b/docs/changes.txt index 4185e8e3be..f5e4c531fb 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -182,6 +182,7 @@ All: - fix for deleting entries at root level in wxFileConfig - wxStopWatch::Start() didn't resume it contrary to the docs - accept '\r' as delimiter when parsing dates +- fixed duplicate wxFontEncoding values Unix (GUI): diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h index afa99f08f1..e76648679b 100644 --- a/include/wx/fontenc.h +++ b/include/wx/fontenc.h @@ -78,7 +78,7 @@ enum wxFontEncoding // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html) wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932, // Shift JIS - wxFONTENCODING_EUC_JP, // Extended Unix Codepage for Japanese + wxFONTENCODING_EUC_JP = wxFONTENCODING_UTF8 + 1, // Extended Unix Codepage for Japanese wxFONTENCODING_UNICODE, // Unicode - currently used only by // wxEncodingConverter class