diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-07-11 14:46:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-07-11 14:46:28 (GMT) |
| commit | cc1227d6d930a024f7b8ce22f70265a2020f625d (patch) | |
| tree | 53401ad2bde16eeae0aad7aa6ae999ab183f7d0f /generic/tkTextDisp.c | |
| parent | b796c89cc1a4732b7009ddd6d4eebfc41378f38f (diff) | |
| parent | 47a7d357fcba6b6d2898e876f9e9a5403ff4e22f (diff) | |
| download | tk-cc1227d6d930a024f7b8ce22f70265a2020f625d.zip tk-cc1227d6d930a024f7b8ce22f70265a2020f625d.tar.gz tk-cc1227d6d930a024f7b8ce22f70265a2020f625d.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tkTextDisp.c')
| -rw-r--r-- | generic/tkTextDisp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 027efc8..66766ea 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -985,8 +985,8 @@ GetStyle( styleValues.elide = tagPtr->elide > 0; elidePrio = tagPtr->priority; } - if ((tagPtr->wrapMode != TEXT_WRAPMODE_NULL) - && (tagPtr->priority > wrapPrio)) { + if (((tagPtr->wrapMode == TEXT_WRAPMODE_CHAR) || (tagPtr->wrapMode == TEXT_WRAPMODE_NONE) + || (tagPtr->wrapMode == TEXT_WRAPMODE_WORD)) && (tagPtr->priority > wrapPrio)) { styleValues.wrapMode = tagPtr->wrapMode; wrapPrio = tagPtr->priority; } |