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

Imported Tk 8.6.9

Browse Source
This commit is contained in:
Steve Dower
2018-12-11 10:05:28 -08:00
parent 753ac6b037
commit 5ba5cbc9af
184 changed files with 6223 additions and 1994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
generic/tkMenu.c
View File

@@ -1700,12 +1700,12 @@ PostProcessEntry(
if (mePtr->labelPtr == NULL) {
mePtr->labelLength = 0;
} else {
(void)Tcl_GetStringFromObj(mePtr->labelPtr, &mePtr->labelLength);
Tcl_GetStringFromObj(mePtr->labelPtr, &mePtr->labelLength);
}
if (mePtr->accelPtr == NULL) {
mePtr->accelLength = 0;
} else {
(void)Tcl_GetStringFromObj(mePtr->accelPtr, &mePtr->accelLength);
Tcl_GetStringFromObj(mePtr->accelPtr, &mePtr->accelLength);
}
/*
@@ -2495,6 +2495,22 @@ MenuVarProc(
}
menuPtr = mePtr->menuPtr;
if (menuPtr->menuFlags & MENU_DELETION_PENDING) {
return NULL;
}
/*
* See ticket [5d991b82].
*/
if (mePtr->namePtr == NULL) {
Tcl_UntraceVar2(interp, name1, name2,
TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
MenuVarProc, clientData);
return NULL;
}
name = Tcl_GetString(mePtr->namePtr);
/*