diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-20 08:02:30 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-20 08:02:30 (GMT) |
| commit | 81b0bd7641a9d2f63154c97d41c27bbb696ef674 (patch) | |
| tree | a17119411589e8c1291df53e2546243d84e78583 /generic/tkText.c | |
| parent | 93d974c265533cf2445446954346be8192e850a0 (diff) | |
| download | tk-81b0bd7641a9d2f63154c97d41c27bbb696ef674.zip tk-81b0bd7641a9d2f63154c97d41c27bbb696ef674.tar.gz tk-81b0bd7641a9d2f63154c97d41c27bbb696ef674.tar.bz2 | |
Fix [9e31fd944934e269121fa78ff56b7b86f33e6db6|9e31fd9449]: X11/X.h and Windows.h have conflicting symbols.
Also fix a few newer (harmless) gcc warnings.
Diffstat (limited to 'generic/tkText.c')
| -rw-r--r-- | generic/tkText.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/generic/tkText.c b/generic/tkText.c index 8edf82d..425687f 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -568,7 +568,7 @@ CreateWidget( textPtr->state = TK_TEXT_STATE_NORMAL; textPtr->relief = TK_RELIEF_FLAT; - textPtr->cursor = None; + textPtr->cursor = 0; textPtr->charWidth = 1; textPtr->charHeight = 10; textPtr->wrapMode = TEXT_WRAPMODE_CHAR; @@ -2186,28 +2186,28 @@ ConfigureText( textPtr->selTagPtr->fgColor = textPtr->selFgColorPtr; textPtr->selTagPtr->affectsDisplay = 0; textPtr->selTagPtr->affectsDisplayGeometry = 0; - 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) + 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 || (textPtr->selTagPtr->wrapMode != TEXT_WRAPMODE_NULL)) { textPtr->selTagPtr->affectsDisplay = 1; textPtr->selTagPtr->affectsDisplayGeometry = 1; } - if ((textPtr->selTagPtr->border != NULL) - || (textPtr->selTagPtr->reliefString != NULL) - || (textPtr->selTagPtr->bgStipple != None) - || (textPtr->selTagPtr->fgColor != NULL) - || (textPtr->selTagPtr->fgStipple != None) - || (textPtr->selTagPtr->overstrikeString != NULL) - || (textPtr->selTagPtr->underlineString != NULL)) { + if (textPtr->selTagPtr->border + || textPtr->selTagPtr->reliefString + || textPtr->selTagPtr->bgStipple + || textPtr->selTagPtr->fgColor + || textPtr->selTagPtr->fgStipple + || textPtr->selTagPtr->overstrikeString + || textPtr->selTagPtr->underlineString) { textPtr->selTagPtr->affectsDisplay = 1; } TkTextRedrawTag(NULL, textPtr, NULL, NULL, textPtr->selTagPtr, 1); |