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 /win/tkWin3d.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 'win/tkWin3d.c')
| -rw-r--r-- | win/tkWin3d.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/win/tkWin3d.c b/win/tkWin3d.c index d3c443d..bf7a539 100644 --- a/win/tkWin3d.c +++ b/win/tkWin3d.c @@ -127,7 +127,7 @@ Tk_3DVerticalBevel( HDC dc = TkWinGetDrawableDC(display, drawable, &state); int half; - if ((borderPtr->lightGC == None) && (relief != TK_RELIEF_FLAT)) { + if (!borderPtr->lightGC && (relief != TK_RELIEF_FLAT)) { TkpGetShadows(borderPtr, tkwin); } @@ -222,7 +222,7 @@ Tk_3DHorizontalBevel( HDC dc = TkWinGetDrawableDC(display, drawable, &state); int topColor, bottomColor; - if ((borderPtr->lightGC == None) && (relief != TK_RELIEF_FLAT)) { + if (!borderPtr->lightGC && (relief != TK_RELIEF_FLAT)) { TkpGetShadows(borderPtr, tkwin); } @@ -339,7 +339,7 @@ TkpGetShadows( int r, g, b; XGCValues gcValues; - if (borderPtr->lightGC != None) { + if (borderPtr->lightGC) { return; } @@ -465,10 +465,10 @@ TkpGetShadows( return; } - if (borderPtr->shadow == None) { + if (!borderPtr->shadow) { borderPtr->shadow = Tk_GetBitmap((Tcl_Interp *) NULL, tkwin, Tk_GetUid("gray50")); - if (borderPtr->shadow == None) { + if (!borderPtr->shadow) { Tcl_Panic("TkpGetShadows couldn't allocate bitmap for border"); } } @@ -540,7 +540,7 @@ TkWinGetBorderPixels( { WinBorder *borderPtr = (WinBorder *) border; - if (borderPtr->info.lightGC == None) { + if (!borderPtr->info.lightGC) { TkpGetShadows(&borderPtr->info, tkwin); } switch (which) { |