From d113c70e69fb5934fe86d84b7c03bde2bd9e06d3 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 8 Jan 2018 09:03:57 +0000 Subject: Some code cleanup, suggested by Christian Werner. Cherry-picked from bug-00a27923ee branch. --- macosx/tkMacOSXFont.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index fd4c19a..d92e6b4 100644 --- a/macosx/tkMacOSXFont.c +++ b/macosx/tkMacOSXFont.c @@ -259,7 +259,7 @@ InitFont( } fontPtr->nsFont = nsFont; // some don't like antialiasing on fixed-width even if bigger than limit -// dontAA = [nsFont isFixedPitch] && fontPtr->font.fa.size <= 10; + // dontAA = [nsFont isFixedPitch] && fontPtr->font.fa.size <= 10; if (antialiasedTextEnabled >= 0/* || dontAA*/) { renderingMode = (antialiasedTextEnabled == 0/* || dontAA*/) ? NSFontIntegerAdvancementsRenderingMode : @@ -819,15 +819,6 @@ TkpMeasureCharsInContext( *lengthPtr = 0; return 0; } -#if 0 - /* Back-compatibility with ATSUI renderer, appears not to be needed */ - if (rangeStart == 0 && maxLength == 1 && (flags & TK_ISOLATE_END) && - !(flags & TK_AT_LEAST_ONE)) { - length = 0; - fit = 0; - goto done; - } -#endif if (maxLength > 32767) { maxLength = 32767; } @@ -921,7 +912,6 @@ done: flags & TK_AT_LEAST_ONE ? "atLeastOne " : "", flags & TK_ISOLATE_END ? "isolateEnd " : "", length, fit); -//if (!(rangeLength==1 && rangeStart == 0)) fprintf(stderr, " measure len=%d (max=%d, w=%.0f) from %d (nb=%d): source=\"%s\": index=%d return %d\n",rangeLength,maxLength,width,rangeStart,numBytes, source+rangeStart, index, fit); #endif *lengthPtr = length; return fit; -- cgit v0.12