diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-10 10:07:19 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-10 10:07:19 (GMT) |
commit | ef50c3a8b950562b14a7fd5677492c3deaf1bf8f (patch) | |
tree | 7e3ba7422180dab95eadaa951af2978df714c3c6 /win/tkWinButton.c | |
parent | 65b61144b87cb08978118bcc11ddbf96768c02f4 (diff) | |
parent | 7b3b30d439640b2474a81ff1b97c8ae264811165 (diff) | |
download | tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.zip tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.tar.gz tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.tar.bz2 |
Merge 8.6
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 e0f9857..f4039cf 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) { |