diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-13 14:48:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-13 14:48:54 (GMT) |
| commit | 5cb97cd301ec4db2dde21a900ddf3593b5998aeb (patch) | |
| tree | 2d94ba06a5b3bde7ec71535d59e0f5343d82d352 /generic | |
| parent | 587df2a3c0d221979267d8549003fa2dda184a38 (diff) | |
| parent | c5018a98c472597e3f6e1bb4717bdf89b89c2cf2 (diff) | |
| download | tk-5cb97cd301ec4db2dde21a900ddf3593b5998aeb.zip tk-5cb97cd301ec4db2dde21a900ddf3593b5998aeb.tar.gz tk-5cb97cd301ec4db2dde21a900ddf3593b5998aeb.tar.bz2 | |
Merge 8.5
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkCanvPoly.c | 2 | ||||
| -rw-r--r-- | generic/tkRectOval.c | 3 | ||||
| -rw-r--r-- | generic/tkSquare.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c index be80378..6a8f865 100644 --- a/generic/tkCanvPoly.c +++ b/generic/tkCanvPoly.c @@ -518,7 +518,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 daae092..359d3ef 100644 --- a/generic/tkRectOval.c +++ b/generic/tkRectOval.c @@ -515,8 +515,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 40d5e8f..e92c03c 100644 --- a/generic/tkSquare.c +++ b/generic/tkSquare.c @@ -335,7 +335,7 @@ SquareConfigure( Tk_SetWindowBackground(squarePtr->tkwin, Tk_3DBorderColor(bgBorder)->pixel); Tcl_GetBooleanFromObj(NULL, squarePtr->doubleBufferPtr, &doubleBuffer); - if ((squarePtr->gc == NULL) && (doubleBuffer)) { + if ((squarePtr->gc == NULL) && doubleBuffer) { XGCValues gcValues; gcValues.function = GXcopy; gcValues.graphics_exposures = False; |