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 /unix | |
| 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 'unix')
| -rw-r--r-- | unix/tkUnixDefault.h | 2 | ||||
| -rw-r--r-- | unix/tkUnixMenubu.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h index a8ecdc1..7663903 100644 --- a/unix/tkUnixDefault.h +++ b/unix/tkUnixDefault.h @@ -243,7 +243,7 @@ #define DEF_MENU_ENTRY_ACTIVE_FG (char *) NULL #define DEF_MENU_ENTRY_ACCELERATOR (char *) NULL #define DEF_MENU_ENTRY_BG (char *) NULL -#define DEF_MENU_ENTRY_BITMAP None +#define DEF_MENU_ENTRY_BITMAP NULL #define DEF_MENU_ENTRY_COLUMN_BREAK "0" #define DEF_MENU_ENTRY_COMMAND (char *) NULL #define DEF_MENU_ENTRY_COMPOUND "none" diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c index 48d3fb9..3f5b632 100644 --- a/unix/tkUnixMenubu.c +++ b/unix/tkUnixMenubu.c @@ -103,7 +103,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) { @@ -369,7 +369,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) { |