ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to tk 8.5.19

Browse Source
This commit is contained in:
Zachary Ware
2017-11-24 17:53:51 -06:00
parent 27e7dfc7da
commit c67b328f06
325 changed files with 12511 additions and 12047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
generic/tkFont.c
View File

@@ -1522,8 +1522,8 @@ FreeFontObjProc(
fontPtr->objRefCount--;
if ((fontPtr->resourceRefCount == 0) && (fontPtr->objRefCount == 0)) {
ckfree((char *) fontPtr);
objPtr->internalRep.twoPtrValue.ptr1 = NULL;
}
objPtr->internalRep.twoPtrValue.ptr1 = NULL;
}
}
@@ -2069,14 +2069,14 @@ Tk_ComputeTextLayout(
NewChunk(&layoutPtr, &maxChunks, start, 1, curX, newX,
baseline)->numDisplayChars = -1;
start++;
curX = newX;
flags &= ~TK_AT_LEAST_ONE;
if ((start < end) &&
((wrapLength <= 0) || (newX <= wrapLength))) {
/*
* More chars can still fit on this line.
*/
curX = newX;
flags &= ~TK_AT_LEAST_ONE;
continue;
}
} else {
@@ -3015,7 +3015,6 @@ ConfigAttributesObj(
for (i = 0; i < objc; i += 2) {
optionPtr = objv[i];
valuePtr = objv[i + 1];
if (Tcl_GetIndexFromObj(interp, optionPtr, fontOpt, "option", 1,
&index) != TCL_OK) {
@@ -3034,6 +3033,7 @@ ConfigAttributesObj(
}
return TCL_ERROR;
}
valuePtr = objv[i + 1];
switch (index) {
case FONT_FAMILY: