diff options
| author | culler <culler> | 2017-10-30 18:25:59 (GMT) |
|---|---|---|
| committer | culler <culler> | 2017-10-30 18:25:59 (GMT) |
| commit | 39205d2bf1e853b4745274f77115a60293dec183 (patch) | |
| tree | 94758e5ce5c39c35c7dff0bc65f81da969fe6b06 | |
| parent | 60d5bf93ccc95612d7bbed628289755086b8059f (diff) | |
| download | tk-39205d2bf1e853b4745274f77115a60293dec183.zip tk-39205d2bf1e853b4745274f77115a60293dec183.tar.gz tk-39205d2bf1e853b4745274f77115a60293dec183.tar.bz2 | |
Reworked the regression test so that it would more precisely
target the changed behavior of DisplayText.
| -rw-r--r-- | generic/tkTextDisp.c | 7 | ||||
| -rw-r--r-- | generic/tkTextWind.c | 9 | ||||
| -rw-r--r-- | tests/textDisp.test | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 24184e3..238ae1a 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -4148,7 +4148,6 @@ DisplayText( numRedisplays++; if (tkTextDebug) { Tcl_SetVar2(interp, "tk_textRedraw", NULL, "", TCL_GLOBAL_ONLY); - Tcl_SetVar2(interp, "tk_textEmbWinDisplay", NULL, "", TCL_GLOBAL_ONLY); } /* @@ -4509,6 +4508,12 @@ DisplayText( x = -chunkPtr->width; } + if (tkTextDebug) { + char string[TK_POS_CHARS]; + + TkTextPrintIndex(textPtr, &dlPtr->index, string); + LOG("tk_textEmbWinDisplay", string); + } TkTextEmbWinDisplayProc(textPtr, chunkPtr, x, dlPtr->spaceAbove, dlPtr->height-dlPtr->spaceAbove-dlPtr->spaceBelow, diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c index dcee36e..c9fc20f 100644 --- a/generic/tkTextWind.c +++ b/generic/tkTextWind.c @@ -1112,15 +1112,6 @@ TkTextEmbWinDisplayProc( return; } - if (tkTextDebug) { - /* - * The variable tk_textEmbWinDisplay is cleared in DisplayText. - */ - - Tcl_SetVar2(textPtr->interp, "tk_textEmbWinDisplay", NULL, - Tk_PathName(tkwin), - TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT); - } if ((x + chunkPtr->width) <= 0) { /* * The window is off-screen; just unmap it. diff --git a/tests/textDisp.test b/tests/textDisp.test index 5fdf8e1..115b8cf 100644 --- a/tests/textDisp.test +++ b/tests/textDisp.test @@ -968,7 +968,7 @@ test textDisp-6.10 {DisplayText, redisplay embedded windows after scroll.} {aqua .t delete 2.0 3.0 update list $tk_textEmbWinDisplay -} {{.t.button_one .t.button_two .t.button_three}} +} {{4.0 6.0}} # The following group of tests is marked non-portable because |