Posted to tcl by patthoyts at Wed Oct 28 22:59:17 GMT 2009view raw

  1. diff --git a/win/tkWinFont.c b/win/tkWinFont.c
  2. index b7d2a9a..f9a4b71 100644
  3. --- a/win/tkWinFont.c
  4. +++ b/win/tkWinFont.c
  5. @@ -1586,20 +1586,7 @@ InitFont(
  6.  
  7. fontPtr->font.fid = (Font) fontPtr;
  8. fontPtr->hwnd = hwnd;
  9. - fontPtr->pixelSize = tm.tmHeight;
  10. -
  11. - /*
  12. - * The font pixelSize should be the tmHeight - tmInternalLeading
  13. - * but this causes fonts to appear too small on for instance
  14. - * Russian systems where there is internal leading in use.
  15. - * This hack appears to sort things out.
  16. - * NB: the logic on this flag is reversed - this means if the
  17. - * font is not fixed then subtract the leading value.
  18. - */
  19. -
  20. - if (tm.tmPitchAndFamily & TMPF_FIXED_PITCH) {
  21. - fontPtr->pixelSize -= tm.tmInternalLeading;
  22. - }
  23. + fontPtr->pixelSize = tm.tmHeight - tm.tmInternalLeading;;
  24.  
  25. faPtr = &fontPtr->font.fa;
  26. faPtr->family = Tk_GetUid(Tcl_DStringValue(&faceString));
  27. @@ -2576,9 +2563,6 @@ FamilyExists(
  28. * corresponding appropriate TrueType fonts to be selected.
  29. */
  30.  
  31. - if (strcasecmp(faceName, "Courier") == 0) {
  32. - return 0;
  33. - }
  34. if (strcasecmp(faceName, "Times") == 0) {
  35. return 0;
  36. }