Posted to tcl by patthoyts at Wed Oct 28 22:59:17 GMT 2009view pretty
diff --git a/win/tkWinFont.c b/win/tkWinFont.c index b7d2a9a..f9a4b71 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -1586,20 +1586,7 @@ InitFont( fontPtr->font.fid = (Font) fontPtr; fontPtr->hwnd = hwnd; - fontPtr->pixelSize = tm.tmHeight; - - /* - * The font pixelSize should be the tmHeight - tmInternalLeading - * but this causes fonts to appear too small on for instance - * Russian systems where there is internal leading in use. - * This hack appears to sort things out. - * NB: the logic on this flag is reversed - this means if the - * font is not fixed then subtract the leading value. - */ - - if (tm.tmPitchAndFamily & TMPF_FIXED_PITCH) { - fontPtr->pixelSize -= tm.tmInternalLeading; - } + fontPtr->pixelSize = tm.tmHeight - tm.tmInternalLeading;; faPtr = &fontPtr->font.fa; faPtr->family = Tk_GetUid(Tcl_DStringValue(&faceString)); @@ -2576,9 +2563,6 @@ FamilyExists( * corresponding appropriate TrueType fonts to be selected. */ - if (strcasecmp(faceName, "Courier") == 0) { - return 0; - } if (strcasecmp(faceName, "Times") == 0) { return 0; }