Fix [9e31fd944934e269121fa78ff56b7b86f33e6db6|9e31fd9449]: X11/X.h and Windows.h have conflicting symbols.

Also fix a few newer (harmless) gcc warnings.

1 files changed, 21 insertions, 21 deletions

diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index a310dd7..5bf1899 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -489,29 +489,29 @@ TkTextTagCmd(
 
 	    tagPtr->affectsDisplay = 0;
 	    tagPtr->affectsDisplayGeometry = 0;
-	    if ((tagPtr->elideString != NULL)
-		    || (tagPtr->tkfont != None)
-		    || (tagPtr->justifyString != NULL)
-		    || (tagPtr->lMargin1String != NULL)
-		    || (tagPtr->lMargin2String != NULL)
-		    || (tagPtr->offsetString != NULL)
-		    || (tagPtr->rMarginString != NULL)
-		    || (tagPtr->spacing1String != NULL)
-		    || (tagPtr->spacing2String != NULL)
-		    || (tagPtr->spacing3String != NULL)
-		    || (tagPtr->tabStringPtr != NULL)
+	    if (tagPtr->elideString
+		    || tagPtr->tkfont
+		    || tagPtr->justifyString
+		    || tagPtr->lMargin1String
+		    || tagPtr->lMargin2String
+		    || tagPtr->offsetString
+		    || tagPtr->rMarginString
+		    || tagPtr->spacing1String
+		    || tagPtr->spacing2String
+		    || tagPtr->spacing3String
+		    || tagPtr->tabStringPtr
 		    || (tagPtr->tabStyle != TK_TEXT_TABSTYLE_NONE)
 		    || (tagPtr->wrapMode != TEXT_WRAPMODE_NULL)) {
 		tagPtr->affectsDisplay = 1;
 		tagPtr->affectsDisplayGeometry = 1;
 	    }
-	    if ((tagPtr->border != NULL)
-		    || (tagPtr->reliefString != NULL)
-		    || (tagPtr->bgStipple != None)
-		    || (tagPtr->fgColor != NULL)
-		    || (tagPtr->fgStipple != None)
-		    || (tagPtr->overstrikeString != NULL)
-		    || (tagPtr->underlineString != NULL)) {
+	    if (tagPtr->border
+		    || tagPtr->reliefString
+		    || tagPtr->bgStipple
+		    || tagPtr->fgColor
+		    || tagPtr->fgStipple
+		    || tagPtr->overstrikeString
+		    || tagPtr->underlineString) {
 		tagPtr->affectsDisplay = 1;
 	    }
 	    if (!newTag) {
@@ -987,10 +987,10 @@ TkTextCreateTag(
     tagPtr->borderWidthPtr = NULL;
     tagPtr->reliefString = NULL;
     tagPtr->relief = TK_RELIEF_FLAT;
-    tagPtr->bgStipple = None;
+    tagPtr->bgStipple = 0;
     tagPtr->fgColor = NULL;
     tagPtr->tkfont = NULL;
-    tagPtr->fgStipple = None;
+    tagPtr->fgStipple = 0;
     tagPtr->justifyString = NULL;
     tagPtr->justify = TK_JUSTIFY_LEFT;
     tagPtr->lMargin1String = NULL;
@@ -1556,7 +1556,7 @@ TkTextPickCurrent(
 	    textPtr->pickEvent.xcrossing.display = eventPtr->xmotion.display;
 	    textPtr->pickEvent.xcrossing.window = eventPtr->xmotion.window;
 	    textPtr->pickEvent.xcrossing.root = eventPtr->xmotion.root;
-	    textPtr->pickEvent.xcrossing.subwindow = None;
+	    textPtr->pickEvent.xcrossing.subwindow = 0;
 	    textPtr->pickEvent.xcrossing.time = eventPtr->xmotion.time;
 	    textPtr->pickEvent.xcrossing.x = eventPtr->xmotion.x;
 	    textPtr->pickEvent.xcrossing.y = eventPtr->xmotion.y;