diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-20 09:44:05 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-20 09:44:05 (GMT) |
commit | e26cd8eb2b04a4bd764e382cbcbfe4b1030796c6 (patch) | |
tree | 6bca925436edc8dce431cfd10502d50117b62d46 /generic/tkSquare.c | |
parent | 0c4227b6cc6e9716ddd086a75e45c4e9373fa51b (diff) | |
parent | 81b0bd7641a9d2f63154c97d41c27bbb696ef674 (diff) | |
download | tk-e26cd8eb2b04a4bd764e382cbcbfe4b1030796c6.zip tk-e26cd8eb2b04a4bd764e382cbcbfe4b1030796c6.tar.gz tk-e26cd8eb2b04a4bd764e382cbcbfe4b1030796c6.tar.bz2 |
Fix [9e31fd9449]: X11/X.h and Windows.h have conflicting symbols
*** POTENTIAL INCOMPATIBILITY *** for Win32 only: On X11 and Mac, "None" can still be used as before
Diffstat (limited to 'generic/tkSquare.c')
-rw-r--r-- | generic/tkSquare.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkSquare.c b/generic/tkSquare.c index 36d2d6e..91247d6 100644 --- a/generic/tkSquare.c +++ b/generic/tkSquare.c @@ -169,7 +169,7 @@ SquareObjCmd( squarePtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(squarePtr->tkwin), SquareWidgetObjCmd, squarePtr, SquareDeletedProc); - squarePtr->gc = None; + squarePtr->gc = 0; squarePtr->optionTable = optionTable; if (Tk_InitOptions(interp, (char *) squarePtr, optionTable, tkwin) @@ -335,7 +335,7 @@ SquareConfigure( Tk_SetWindowBackground(squarePtr->tkwin, Tk_3DBorderColor(bgBorder)->pixel); Tcl_GetBooleanFromObj(NULL, squarePtr->doubleBufferPtr, &doubleBuffer); - if ((squarePtr->gc == None) && (doubleBuffer)) { + if (!squarePtr->gc && doubleBuffer) { XGCValues gcValues; gcValues.function = GXcopy; gcValues.graphics_exposures = False; @@ -397,10 +397,10 @@ SquareObjEventProc( squarePtr->updatePending = 1; } } else if (eventPtr->type == DestroyNotify) { - if (squarePtr->tkwin != NULL) { + if (squarePtr->tkwin) { Tk_FreeConfigOptions((char *) squarePtr, squarePtr->optionTable, squarePtr->tkwin); - if (squarePtr->gc != None) { + if (squarePtr->gc) { Tk_FreeGC(squarePtr->display, squarePtr->gc); } squarePtr->tkwin = NULL; @@ -475,7 +475,7 @@ SquareDisplay( { Square *squarePtr = clientData; Tk_Window tkwin = squarePtr->tkwin; - Pixmap pm = None; + Pixmap pm = 0; Drawable d; int borderWidth, size, relief; Tk_3DBorder bgBorder, fgBorder; |