tagPtr->wrapMode is an enum with only 4 possible values, so no need t…

…o test for 3 of them
tcltk · Jan 22, 2024 · cb5fcd0 · cb5fcd0
1 parent 3f7f4e1
commit cb5fcd0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/generic/tkText.c b/generic/tkText.c
@@ -2269,9 +2269,7 @@ ConfigureText(
 	    || (textPtr->selTagPtr->tabStringPtr != NULL)
 	    || (textPtr->selTagPtr->tabStyle == TK_TEXT_TABSTYLE_TABULAR)
 	    || (textPtr->selTagPtr->tabStyle == TK_TEXT_TABSTYLE_WORDPROCESSOR)
-	    || (textPtr->selTagPtr->wrapMode == TEXT_WRAPMODE_CHAR)
-	    || (textPtr->selTagPtr->wrapMode == TEXT_WRAPMODE_NONE)
-	    || (textPtr->selTagPtr->wrapMode == TEXT_WRAPMODE_WORD)) {
+	    || (textPtr->selTagPtr->wrapMode != TEXT_WRAPMODE_NULL)) {
 	textPtr->selTagPtr->affectsDisplay = 1;
 	textPtr->selTagPtr->affectsDisplayGeometry = 1;
     }

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
@@ -984,9 +984,7 @@ GetStyle(
 	    styleValues.elide = tagPtr->elide > 0;
 	    elidePrio = tagPtr->priority;
 	}
-	if (((tagPtr->wrapMode == TEXT_WRAPMODE_CHAR)
-		|| (tagPtr->wrapMode == TEXT_WRAPMODE_NONE)
-		|| (tagPtr->wrapMode == TEXT_WRAPMODE_WORD))
+	if ((tagPtr->wrapMode != TEXT_WRAPMODE_NULL)
 		&& (tagPtr->priority > wrapPrio)) {
 	    styleValues.wrapMode = tagPtr->wrapMode;
 	    wrapPrio = tagPtr->priority;

diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
@@ -442,9 +442,7 @@ TkTextTagCmd(
 		    || (tagPtr->tabStringPtr != NULL)
 		    || (tagPtr->tabStyle == TK_TEXT_TABSTYLE_TABULAR)
 		    || (tagPtr->tabStyle == TK_TEXT_TABSTYLE_WORDPROCESSOR)
-		    || (tagPtr->wrapMode == TEXT_WRAPMODE_CHAR)
-		    || (tagPtr->wrapMode == TEXT_WRAPMODE_NONE)
-		    || (tagPtr->wrapMode == TEXT_WRAPMODE_WORD)) {
+		    || (tagPtr->wrapMode != TEXT_WRAPMODE_NULL)) {
 		tagPtr->affectsDisplay = 1;
 		tagPtr->affectsDisplayGeometry = 1;
 	    }