diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-13 14:44:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-13 14:44:54 (GMT) |
| commit | c5018a98c472597e3f6e1bb4717bdf89b89c2cf2 (patch) | |
| tree | 75d77b8bbc0c087b905d4dbdda31e7f0e024f442 | |
| parent | 1cf82956754b0b42ef212635195b5c29fc93a0fc (diff) | |
| download | tk-c5018a98c472597e3f6e1bb4717bdf89b89c2cf2.zip tk-c5018a98c472597e3f6e1bb4717bdf89b89c2cf2.tar.gz tk-c5018a98c472597e3f6e1bb4717bdf89b89c2cf2.tar.bz2 | |
Not actually necessary to fix those (they don't give warnings because those are switched off), but while on it it's better to correct those ill-usages of 'None' too
| -rw-r--r-- | generic/tkCanvPoly.c | 2 | ||||
| -rw-r--r-- | generic/tkRectOval.c | 2 | ||||
| -rw-r--r-- | generic/tkSquare.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c index 630400f..7171e9f 100644 --- a/generic/tkCanvPoly.c +++ b/generic/tkCanvPoly.c @@ -524,7 +524,7 @@ ConfigurePolygon( * Mac OS X CG drawing needs access to the outline linewidth * even for fills (as linewidth controls antialiasing). */ - gcValues.line_width = polyPtr->outline.gc != None ? + gcValues.line_width = polyPtr->outline.gc != NULL ? polyPtr->outline.gc->line_width : 0; mask |= GCLineWidth; #endif diff --git a/generic/tkRectOval.c b/generic/tkRectOval.c index 4431341..55c2a61 100644 --- a/generic/tkRectOval.c +++ b/generic/tkRectOval.c @@ -522,7 +522,7 @@ ConfigureRectOval( * Mac OS X CG drawing needs access to the outline linewidth * even for fills (as linewidth controls antialiasing). */ - gcValues.line_width = rectOvalPtr->outline.gc != None ? + gcValues.line_width = rectOvalPtr->outline.gc != NULL ? rectOvalPtr->outline.gc->line_width : 0; mask |= GCLineWidth; #endif diff --git a/generic/tkSquare.c b/generic/tkSquare.c index 355a447..b8a4fad 100644 --- a/generic/tkSquare.c +++ b/generic/tkSquare.c @@ -332,7 +332,7 @@ SquareConfigure( Tk_SetWindowBackground(squarePtr->tkwin, Tk_3DBorderColor(bgBorder)->pixel); Tcl_GetBooleanFromObj(NULL, squarePtr->doubleBufferPtr, &doubleBuffer); - if ((squarePtr->gc == None) && (doubleBuffer)) { + if ((squarePtr->gc == NULL) && doubleBuffer) { XGCValues gcValues; gcValues.function = GXcopy; gcValues.graphics_exposures = False; @@ -397,7 +397,7 @@ SquareObjEventProc( if (squarePtr->tkwin != NULL) { Tk_FreeConfigOptions((char *) squarePtr, squarePtr->optionTable, squarePtr->tkwin); - if (squarePtr->gc != None) { + if (squarePtr->gc != NULL) { Tk_FreeGC(squarePtr->display, squarePtr->gc); } squarePtr->tkwin = NULL; |