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 /unix/tkUnixMenubu.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 'unix/tkUnixMenubu.c')
| -rw-r--r-- | unix/tkUnixMenubu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c index ba78016..c49f15b 100644 --- a/unix/tkUnixMenubu.c +++ b/unix/tkUnixMenubu.c @@ -92,7 +92,7 @@ TkpDisplayMenuButton( border = mbPtr->normalBorder; } - if (mbPtr->image != None) { + if (mbPtr->image != NULL) { Tk_SizeOfImage(mbPtr->image, &width, &height); haveImage = 1; } else if (mbPtr->bitmap != None) { @@ -358,7 +358,7 @@ TkpComputeMenuButtonGeometry( txtHeight = 0; avgWidth = 0; - if (mbPtr->image != None) { + if (mbPtr->image != NULL) { Tk_SizeOfImage(mbPtr->image, &width, &height); haveImage = 1; } else if (mbPtr->bitmap != None) { |