diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-07-11 13:45:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-07-11 13:45:49 (GMT) |
| commit | 47a7d357fcba6b6d2898e876f9e9a5403ff4e22f (patch) | |
| tree | 947a3b50331d298e653a35cd54c07fedba5f8a23 /generic | |
| parent | 1d0390ab1fbd8c026186ce4b9a747d4b35192bf8 (diff) | |
| download | tk-47a7d357fcba6b6d2898e876f9e9a5403ff4e22f.zip tk-47a7d357fcba6b6d2898e876f9e9a5403ff4e22f.tar.gz tk-47a7d357fcba6b6d2898e876f9e9a5403ff4e22f.tar.bz2 | |
Don't test for != TEXT_WRAPMODE_NULL, since it has a different value for different Tk versions. (Tk 8.6 already does this, missed in Tk 8.7)
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkText.c | 4 | ||||
| -rw-r--r-- | generic/tkTextDisp.c | 4 | ||||
| -rw-r--r-- | generic/tkTextTag.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/generic/tkText.c b/generic/tkText.c index 23e0647..f792c9c 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -2281,7 +2281,9 @@ ConfigureText( || (textPtr->selTagPtr->tabStringPtr != NULL) || (textPtr->selTagPtr->tabStyle == TK_TEXT_TABSTYLE_TABULAR) || (textPtr->selTagPtr->tabStyle == TK_TEXT_TABSTYLE_WORDPROCESSOR) - || (textPtr->selTagPtr->wrapMode != TEXT_WRAPMODE_NULL)) { + || (textPtr->selTagPtr->wrapMode == TEXT_WRAPMODE_CHAR) + || (textPtr->selTagPtr->wrapMode == TEXT_WRAPMODE_NONE) + || (textPtr->selTagPtr->wrapMode == TEXT_WRAPMODE_WORD)) { textPtr->selTagPtr->affectsDisplay = 1; textPtr->selTagPtr->affectsDisplayGeometry = 1; } diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 6afd08e..a01c329 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; } diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c index de91e54..4110e8f 100644 --- a/generic/tkTextTag.c +++ b/generic/tkTextTag.c @@ -647,7 +647,9 @@ TkTextTagCmd( || (tagPtr->tabStringPtr != NULL) || (tagPtr->tabStyle == TK_TEXT_TABSTYLE_TABULAR) || (tagPtr->tabStyle == TK_TEXT_TABSTYLE_WORDPROCESSOR) - || (tagPtr->wrapMode != TEXT_WRAPMODE_NULL)) { + || (tagPtr->wrapMode == TEXT_WRAPMODE_CHAR) + || (tagPtr->wrapMode == TEXT_WRAPMODE_NONE) + || (tagPtr->wrapMode == TEXT_WRAPMODE_WORD)) { tagPtr->affectsDisplay = 1; tagPtr->affectsDisplayGeometry = 1; } |