summaryrefslogtreecommitdiffstats
path: root/generic/tkText.c
diff options
context:
space:
mode:
Diffstat (limited to 'generic/tkText.c')
-rw-r--r--generic/tkText.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/generic/tkText.c b/generic/tkText.c
index bf8d8ef..ff773a1 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -587,7 +587,7 @@ CreateWidget(
textPtr->state = TK_TEXT_STATE_NORMAL;
textPtr->relief = TK_RELIEF_FLAT;
- textPtr->cursor = 0;
+ textPtr->cursor = NULL;
textPtr->charWidth = 1;
textPtr->charHeight = 10;
textPtr->wrapMode = TEXT_WRAPMODE_CHAR;
@@ -2277,17 +2277,17 @@ ConfigureText(
}
textPtr->selTagPtr->affectsDisplay = 0;
textPtr->selTagPtr->affectsDisplayGeometry = 0;
- if (textPtr->selTagPtr->elideString
- || textPtr->selTagPtr->tkfont
- || textPtr->selTagPtr->justifyString
- || textPtr->selTagPtr->lMargin1String
- || textPtr->selTagPtr->lMargin2String
- || textPtr->selTagPtr->offsetString
- || textPtr->selTagPtr->rMarginString
- || textPtr->selTagPtr->spacing1String
- || textPtr->selTagPtr->spacing2String
- || textPtr->selTagPtr->spacing3String
- || textPtr->selTagPtr->tabStringPtr
+ if ((textPtr->selTagPtr->elideString != NULL)
+ || (textPtr->selTagPtr->tkfont != None)
+ || (textPtr->selTagPtr->justifyString != NULL)
+ || (textPtr->selTagPtr->lMargin1String != NULL)
+ || (textPtr->selTagPtr->lMargin2String != NULL)
+ || (textPtr->selTagPtr->offsetString != NULL)
+ || (textPtr->selTagPtr->rMarginString != NULL)
+ || (textPtr->selTagPtr->spacing1String != NULL)
+ || (textPtr->selTagPtr->spacing2String != NULL)
+ || (textPtr->selTagPtr->spacing3String != NULL)
+ || (textPtr->selTagPtr->tabStringPtr != NULL)
|| (textPtr->selTagPtr->wrapMode != TEXT_WRAPMODE_NULL)) {
textPtr->selTagPtr->affectsDisplay = 1;
textPtr->selTagPtr->affectsDisplayGeometry = 1;