From bed07cc212f55c1f366cbae81e2f70dc6e0386b1 Mon Sep 17 00:00:00 2001 From: Catalin Date: Fri, 12 Jun 2015 11:23:57 +0300 Subject: [PATCH] Correctly map MAC_CHARSET to wxFONTENCODING_MACROMAN in wxMSW. Recognize MAC_CHARSET when mapping MSW charsets to wx font encodings. (cherry picked from commit 6e721268943af2acc9e3364c3487d5684f4ddb9a) --- src/msw/fontutil.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp index 010ce5dc84..71231fd899 100644 --- a/src/msw/fontutil.cpp +++ b/src/msw/fontutil.cpp @@ -258,6 +258,10 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs) fontEncoding = wxFONTENCODING_CP1361; break; + case MAC_CHARSET: + fontEncoding = wxFONTENCODING_MACROMAN; + break; + #endif // Win32 case OEM_CHARSET: