X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbe874bd32f35beb3ed8d019c5a24df21a219f8f..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/msw/fontutil.cpp?ds=sidebyside diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp index 41d7adc1c2..266971d30a 100644 --- a/src/msw/fontutil.cpp +++ b/src/msw/fontutil.cpp @@ -141,7 +141,7 @@ wxString wxNativeEncodingInfo::ToString() const bool wxGetNativeFontEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info) { - wxCHECK_MSG( info, NULL, _T("bad pointer in wxGetNativeFontEncoding") ); + wxCHECK_MSG( info, false, _T("bad pointer in wxGetNativeFontEncoding") ); if ( encoding == wxFONTENCODING_DEFAULT ) { @@ -164,7 +164,7 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info) LOGFONT lf; wxZeroMemory(lf); // all default values - lf.lfCharSet = info.charset; + lf.lfCharSet = (BYTE)info.charset; wxStrncpy(lf.lfFaceName, info.facename, WXSIZEOF(lf.lfFaceName)); HFONT hfont = ::CreateFontIndirect(&lf);