Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Tests and fix for [scale ... -variable]. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | bug-5d991b822e |
| Files: | files | file ages | folders |
| SHA3-256: |
c1dd2ab02ea97b8023b9854b1bcb5f38 |
| User & Date: | dgp 2019-05-15 17:30:35 |
Context
|
2019-05-15
| ||
| 18:05 | Tests and fix for similar issues in [menu]. Closed-Leaf check-in: c69b1cc4 user: dgp tags: bug-5d991b822e | |
| 17:30 | Tests and fix for [scale ... -variable]. check-in: c1dd2ab0 user: dgp tags: bug-5d991b822e | |
| 17:20 | Tests and fix for [message ... -textvariable]. check-in: da24fd68 user: dgp tags: bug-5d991b822e | |
Changes
Changes to generic/tkScale.c.
1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 |
/*
* If the variable is unset, then immediately recreate it unless the whole
* interpreter is going away.
*/
if (flags & TCL_TRACE_UNSETS) {
if ((flags & TCL_TRACE_DESTROYED) && !(flags & TCL_INTERP_DESTROYED)) {
Tcl_TraceVar2(interp, Tcl_GetString(scalePtr->varNamePtr),
NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
ScaleVarProc, clientData);
scalePtr->flags |= NEVER_SET;
TkScaleSetValue(scalePtr, scalePtr->value, 1, 0);
}
return NULL;
|
< > > > > > > > > > > > > > > > > > > > > > > |
1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 |
/*
* If the variable is unset, then immediately recreate it unless the whole
* interpreter is going away.
*/
if (flags & TCL_TRACE_UNSETS) {
if (!Tcl_InterpDeleted(interp) && scalePtr->varNamePtr) {
ClientData probe = NULL;
do {
probe = Tcl_VarTraceInfo(interp,
Tcl_GetString(scalePtr->varNamePtr),
TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
ScaleVarProc, probe);
if (probe == (ClientData)scalePtr) {
break;
}
} while (probe);
if (probe) {
/*
* We were able to fetch the unset trace for our
* varNamePtr, which means it is not unset and not
* the cause of this unset trace. Instead some outdated
* former variable must be, and we should ignore it.
*/
return NULL;
}
Tcl_TraceVar2(interp, Tcl_GetString(scalePtr->varNamePtr),
NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
ScaleVarProc, clientData);
scalePtr->flags |= NEVER_SET;
TkScaleSetValue(scalePtr, scalePtr->value, 1, 0);
}
return NULL;
|
Changes to tests/scale.test.
1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 |
} -body {
pack [scale .s]
# non-regression test for bug [55b95f578a] - shall just not crash
.s configure -from -6.8e99 -to 8.8e99
} -cleanup {
destroy .s
} -result {}
option clear
# cleanup
cleanupTests
return
|
> > > > > > > > > > > > > > > > > > > > > > > > > > |
1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 |
} -body {
pack [scale .s]
# non-regression test for bug [55b95f578a] - shall just not crash
.s configure -from -6.8e99 -to 8.8e99
} -cleanup {
destroy .s
} -result {}
test scale-22.1 {Bug [5d991b822e]} {
# Want this not to crash
set var INIT
scale .b -variable var
trace add variable var unset {apply {args {
.b configure -variable {}
}}}
pack .b
bind .b <Configure> {unset var}
update
destroy .b
} {}
test scale-22.2 {Bug [5d991b822e]} {
# Want this not to leak traces
set var INIT
scale .b -variable var
trace add variable var unset {apply {args {
.b configure -variable new
}}}
pack .b
bind .b <Configure> {unset -nocomplain var}
update
destroy .b
unset new
} {}
option clear
# cleanup
cleanupTests
return
|