X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a68bc69086f122b9f7166f505c415db9ee21afe..36d9119341753b2f6f606571702a9b906050a07c:/src/unix/fontutil.cpp diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index 7379c3aab2..9501ea5ee7 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -425,7 +425,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, !wxTestFontEncoding(info) ) { #if wxUSE_FONTMAP - if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) ) + if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &info) ) #endif // wxUSE_FONTMAP { // unspported encoding - replace it with the default @@ -650,7 +650,7 @@ static wxNativeFont wxLoadQueryFont(int pointSize, // In fact pointSize is 10 * the normal point size so // divide by 10. - int pixelHeight = (int) ( (((float)pointSize) / 720.0) * 2.541 * (float) yPixelsPerCM * fudgeFactor) ; + int pixelHeight = (int) ( (((float)pointSize) / 720.0) * 2.541 * (float) yPixelsPerCM) ; // An alternative: assume that the screen is 72 dpi. //int pixelHeight = (int) (((float)pointSize / 720.0) * 72.0) ; @@ -841,7 +841,7 @@ static wxNativeFont wxLoadQueryFont(int pointSize, // if pointSize is -1, don't specify any wxString sizeSpec; - if ( fontSpec == -1 ) + if ( pointSize == -1 ) { sizeSpec = _T('*'); }