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

Import Tk 8.6.12

Browse Source
This commit is contained in:
Steve Dower
2021-11-08 17:28:57 +00:00
parent 070b8750b0
commit c6710de848
290 changed files with 5626 additions and 3660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
generic/tkTextImage.c
View File

@@ -284,7 +284,7 @@ TkTextImageCmd(
for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->imageTable,
&search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr), -1));
(const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr), -1));
}
Tcl_SetObjResult(interp, resultObj);
return TCL_OK;
@@ -764,9 +764,9 @@ EmbImageBboxProc(
* index corresponding to the image's position in the text.
*
* Results:
* The return value is 1 if there is an embedded image by the given name
* in the text widget, 0 otherwise. If the image exists, *indexPtr is
* filled in with its index.
* The return value is TCL_OK if there is an embedded image by the given
* name in the text widget, TCL_ERROR otherwise. If the image exists,
* *indexPtr is filled in with its index.
*
* Side effects:
* None.
@@ -784,18 +784,29 @@ TkTextImageIndex(
TkTextSegment *eiPtr;
if (textPtr == NULL) {
return 0;
return TCL_ERROR;
}
hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->imageTable, name);
if (hPtr == NULL) {
return 0;
return TCL_ERROR;
}
eiPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
indexPtr->tree = textPtr->sharedTextPtr->tree;
indexPtr->linePtr = eiPtr->body.ei.linePtr;
indexPtr->byteIndex = TkTextSegToOffset(eiPtr, indexPtr->linePtr);
return 1;
/*
* If indexPtr refers to somewhere outside the -startline/-endline
* range limits of the widget, error out since the image indeed is not
* reachable from this text widget (it may be reachable from a peer).
*/
if (TkTextIndexAdjustToStartEnd(textPtr, indexPtr, 1) == TCL_ERROR) {
return TCL_ERROR;
}
return TCL_OK;
}
/*