X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55bd3f34b68f55f2cdccf29f40581b7683b9e524..f35719ef1d3b34fb42ebfab33944ea9cdc4413eb:/src/msw/fontutil.cpp?ds=sidebyside diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp index 065b899c61..22d308ceec 100644 --- a/src/msw/fontutil.cpp +++ b/src/msw/fontutil.cpp @@ -123,7 +123,7 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, info->charset = ANSI_CHARSET; break; -#if !defined(__WIN16__) +#if !defined(__WIN16__) && !defined(__WXMICROWIN__) case wxFONTENCODING_CP1250: info->charset = EASTEUROPE_CHARSET; break; @@ -213,7 +213,7 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs) fontEncoding = wxFONTENCODING_CP1252; break; -#ifdef __WIN32__ +#if defined(__WIN32__) && !defined(__WXMICROWIN__) case EASTEUROPE_CHARSET: fontEncoding = wxFONTENCODING_CP1250; break; @@ -369,7 +369,9 @@ void wxFillLogFont(LOGFONT *logFont, const wxFont *font) wxFontEncoding encoding = font->GetEncoding(); if ( !wxGetNativeFontEncoding(encoding, &info) ) { +#if wxUSE_FONTMAP if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) ) +#endif // wxUSE_FONTMAP { // unsupported encoding, replace with the default info.charset = ANSI_CHARSET;