1. wxCalendarCtrl

[wxWidgets.git] / src / msw / fontutil.cpp

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 10e1d82f7e0f7444656deefc3c817f5e46d82054..5fddec59b862b66dbd27b2dfcb99d61aeb37486b 100644 (file)
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -143,6 +143,10 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         case wxFONTENCODING_CP1257:
             info->charset = BALTIC_CHARSET;
             break;
+
+        case wxFONTENCODING_CP874:
+            info->charset = THAI_CHARSET;
+            break;
 #endif // !Win16
 
         case wxFONTENCODING_CP437:
@@ -397,6 +401,7 @@ wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)
             fontEncoding = wxFONTENCODING_CP1252;
             break;
 
+#ifdef __WIN32__
         case EASTEUROPE_CHARSET:
             fontEncoding = wxFONTENCODING_CP1250;
             break;
@@ -425,6 +430,11 @@ wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)
             fontEncoding = wxFONTENCODING_CP1254;
             break;
 
+        case THAI_CHARSET:
+            fontEncoding = wxFONTENCODING_CP437;
+            break;
+#endif
+
         case OEM_CHARSET:
             fontEncoding = wxFONTENCODING_CP437;
             break;