diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-08 08:31:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-08 08:31:34 (GMT) |
| commit | 1cf82956754b0b42ef212635195b5c29fc93a0fc (patch) | |
| tree | b6bf6eaff55be5c6fd20363aea6473c6bfbd76ad /win/tkWinButton.c | |
| parent | 726546cf2742672ce6de89b0500b3e750c6fe3b7 (diff) | |
| parent | d2747a371058fa4128dbd7896fe040f0b3ee6be7 (diff) | |
| download | tk-1cf82956754b0b42ef212635195b5c29fc93a0fc.zip tk-1cf82956754b0b42ef212635195b5c29fc93a0fc.tar.gz tk-1cf82956754b0b42ef212635195b5c29fc93a0fc.tar.bz2 | |
Fix [9e31fd944934e269121fa78ff56b7b86f33e6db6|9e31fd9449]: X11/X.h and Windows.h have conflicting symbols.
*** POTENTIAL INCOMPATIBILITY *** on Windows only: gcc/clang/MSVC will generate new warnings in extensions when the "None" symbol is used incorrectly.
Those warnings are all fixed in the core, that's what most of this commit is doing.
Diffstat (limited to 'win/tkWinButton.c')
| -rw-r--r-- | win/tkWinButton.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win/tkWinButton.c b/win/tkWinButton.c index c36932d..b0de785 100644 --- a/win/tkWinButton.c +++ b/win/tkWinButton.c @@ -434,7 +434,7 @@ TkpDisplayButton( * Display image or bitmap or text for button. */ - if (butPtr->image != None) { + if (butPtr->image != NULL) { Tk_SizeOfImage(butPtr->image, &width, &height); haveImage = 1; } else if (butPtr->bitmap != None) { |