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/tkWinFont.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/tkWinFont.c')
| -rw-r--r-- | win/tkWinFont.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c index d67ea66..977086b 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -519,7 +519,7 @@ TkpGetFontFromAttributes( tkwin = (Tk_Window) ((TkWindow *) tkwin)->mainPtr->winPtr; window = Tk_WindowId(tkwin); - hwnd = (window == None) ? NULL : TkWinGetHWND(window); + hwnd = window ? TkWinGetHWND(window) : NULL; hdc = GetDC(hwnd); /* @@ -632,7 +632,7 @@ TkpGetFontFamilies( Tcl_Obj *resultObj; window = Tk_WindowId(tkwin); - hwnd = (window == None) ? NULL : TkWinGetHWND(window); + hwnd = window ? TkWinGetHWND(window) : NULL; hdc = GetDC(hwnd); resultObj = Tcl_NewObj(); @@ -1089,7 +1089,7 @@ Tk_DrawChars( fontPtr = (WinFont *) gc->font; display->request++; - if (drawable == None) { + if (!drawable) { return; } @@ -1097,14 +1097,14 @@ Tk_DrawChars( SetROP2(dc, tkpWinRopModes[gc->function]); - if ((gc->clip_mask != None) && + if (gc->clip_mask && ((TkpClipMask *) gc->clip_mask)->type == TKP_CLIP_REGION) { SelectClipRgn(dc, (HRGN)((TkpClipMask *)gc->clip_mask)->value.region); } if ((gc->fill_style == FillStippled || gc->fill_style == FillOpaqueStippled) - && gc->stipple != None) { + && gc->stipple) { TkWinDrawable *twdPtr = (TkWinDrawable *) gc->stipple; HBRUSH oldBrush, stipple; HBITMAP oldBitmap, bitmap; @@ -1237,7 +1237,7 @@ TkDrawAngledChars( fontPtr = (WinFont *) gc->font; display->request++; - if (drawable == None) { + if (!drawable) { return; } @@ -1245,14 +1245,14 @@ TkDrawAngledChars( SetROP2(dc, tkpWinRopModes[gc->function]); - if ((gc->clip_mask != None) && + if (gc->clip_mask && ((TkpClipMask *) gc->clip_mask)->type == TKP_CLIP_REGION) { SelectClipRgn(dc, (HRGN)((TkpClipMask *)gc->clip_mask)->value.region); } if ((gc->fill_style == FillStippled || gc->fill_style == FillOpaqueStippled) - && gc->stipple != None) { + && gc->stipple) { TkWinDrawable *twdPtr = (TkWinDrawable *)gc->stipple; HBRUSH oldBrush, stipple; HBITMAP oldBitmap, bitmap; @@ -1568,7 +1568,7 @@ InitFont( TCHAR buf[LF_FACESIZE]; window = Tk_WindowId(tkwin); - hwnd = (window == None) ? NULL : TkWinGetHWND(window); + hwnd = window ? TkWinGetHWND(window) : NULL; hdc = GetDC(hwnd); oldFont = SelectObject(hdc, hFont); |