diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-13 14:51:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-13 14:51:58 (GMT) |
| commit | 40b76dbd4f4479294a9cd461da0400e31734ac2b (patch) | |
| tree | 0b9c811cef1183d76e05a6ac238b5652de5bb12d /generic/tkCanvLine.c | |
| parent | ad423a347178d6279b112f7031e683c7e15d798a (diff) | |
| parent | 75aab96f3ddb340be5aecbb880f1af2a07d9ec25 (diff) | |
| download | tk-40b76dbd4f4479294a9cd461da0400e31734ac2b.zip tk-40b76dbd4f4479294a9cd461da0400e31734ac2b.tar.gz tk-40b76dbd4f4479294a9cd461da0400e31734ac2b.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tkCanvLine.c')
| -rw-r--r-- | generic/tkCanvLine.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c index e35cbd9..dd0a6cb 100644 --- a/generic/tkCanvLine.c +++ b/generic/tkCanvLine.c @@ -296,7 +296,7 @@ CreateLine( linePtr->coordPtr = NULL; linePtr->capStyle = CapButt; linePtr->joinStyle = JoinRound; - linePtr->arrowGC = None; + linePtr->arrowGC = NULL; linePtr->arrow = ARROWS_NONE; linePtr->arrowShapeA = (float)8.0; linePtr->arrowShapeB = (float)10.0; @@ -521,12 +521,12 @@ ConfigureLine( #endif arrowGC = Tk_GetGC(tkwin, mask, &gcValues); } else { - newGC = arrowGC = None; + newGC = arrowGC = NULL; } - if (linePtr->outline.gc != None) { + if (linePtr->outline.gc != NULL) { Tk_FreeGC(Tk_Display(tkwin), linePtr->outline.gc); } - if (linePtr->arrowGC != None) { + if (linePtr->arrowGC != NULL) { Tk_FreeGC(Tk_Display(tkwin), linePtr->arrowGC); } linePtr->outline.gc = newGC; @@ -611,7 +611,7 @@ DeleteLine( if (linePtr->coordPtr != NULL) { ckfree(linePtr->coordPtr); } - if (linePtr->arrowGC != None) { + if (linePtr->arrowGC != NULL) { Tk_FreeGC(display, linePtr->arrowGC); } if (linePtr->firstArrowPtr != NULL) { @@ -840,7 +840,7 @@ DisplayLine( int numPoints; Tk_State state = itemPtr->state; - if ((!linePtr->numPoints) || (linePtr->outline.gc == None)) { + if (!linePtr->numPoints || (linePtr->outline.gc == NULL)) { return; } |