Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Similar tests and fix for [entry .... -textvariable] |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | bug-5d991b822e |
| Files: | files | file ages | folders |
| SHA3-256: |
88e2b06fa30f9a924ef4903ad3300114 |
| User & Date: | dgp 2019-05-12 23:56:49 |
Context
|
2019-05-15
| ||
| 17:01 | Tests for same issues with [listbox ... -listvariable]. check-in: 2271428c user: dgp tags: bug-5d991b822e | |
|
2019-05-12
| ||
| 23:56 | Similar tests and fix for [entry .... -textvariable] check-in: 88e2b06f user: dgp tags: bug-5d991b822e | |
| 23:15 | Similar test and fix for [checkbutton ... -variable]. check-in: 52a952b7 user: dgp tags: bug-5d991b822e | |
Changes
Changes to generic/tkEntry.c.
3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 |
/*
* 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_SetVar2(interp, entryPtr->textVarName, NULL,
entryPtr->string, TCL_GLOBAL_ONLY);
Tcl_TraceVar2(interp, entryPtr->textVarName, NULL,
TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
EntryTextVarProc, clientData);
entryPtr->flags |= ENTRY_VAR_TRACED;
}
return NULL;
}
/*
* Update the entry's text with the value of the variable, unless the
* entry already has that value (this happens when the variable changes
* value because we changed it because someone typed in the entry).
|
| > > > > > > > > > > > > > > > > > > > > | |
3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 |
/*
* 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) && entryPtr->textVarName) {
ClientData probe = NULL;
do {
probe = Tcl_VarTraceInfo(interp,
entryPtr->textVarName,
TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
EntryTextVarProc, probe);
if (probe == (ClientData)entryPtr) {
break;
}
} while (probe);
if (probe) {
/*
* We were able to fetch the unset trace for our
* textVarName, 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_SetVar2(interp, entryPtr->textVarName, NULL,
entryPtr->string, TCL_GLOBAL_ONLY);
Tcl_TraceVar2(interp, entryPtr->textVarName, NULL,
TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
EntryTextVarProc, clientData);
entryPtr->flags |= ENTRY_VAR_TRACED;
}
return NULL;
}
/*
* Update the entry's text with the value of the variable, unless the
* entry already has that value (this happens when the variable changes
* value because we changed it because someone typed in the entry).
|
Changes to tests/entry.test.
3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 |
destroy .e
} -body {
catch {entry .e -textvariable thisnsdoesntexist::myvar} result1
set result1
} -cleanup {
destroy .e
} -result {can't trace "thisnsdoesntexist::myvar": parent namespace doesn't exist}
# Gathered comments about lacks
# XXX Still need to write tests for EntryBlinkProc, EntryFocusProc,
# and EntryTextVarProc.
# No tests for DisplayEntry.
# XXX Still need to write tests for EntryScanTo and EntrySelectTo.
# No tests for EventuallyRedraw
|
> > > > > > > > > > > > > > > > > > > > > > > > > > > > |
3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 |
destroy .e
} -body {
catch {entry .e -textvariable thisnsdoesntexist::myvar} result1
set result1
} -cleanup {
destroy .e
} -result {can't trace "thisnsdoesntexist::myvar": parent namespace doesn't exist}
test entry-25.1 {Bug [5d991b822e]} {
# Want this not to segfault, or write to variable with empty name
set var INIT
entry .b -textvariable var
trace add variable var unset {apply {args {
.b configure -textvariable {}
}}}
pack .b
bind .b <Configure> {unset var}
update
destroy .b
info exists {}
} 0
test entry-25.2 {Bug [5d991b822e]} {
# Want this not to leak traces
set var INIT
entry .b -textvariable var
trace add variable var unset {apply {args {
.b configure -textvariable new
}}}
pack .b
bind .b <Configure> {unset -nocomplain var}
update
destroy .b
unset new
} {}
# Gathered comments about lacks
# XXX Still need to write tests for EntryBlinkProc, EntryFocusProc,
# and EntryTextVarProc.
# No tests for DisplayEntry.
# XXX Still need to write tests for EntryScanTo and EntrySelectTo.
# No tests for EventuallyRedraw
|