diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-31 15:36:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-31 15:36:56 (GMT) |
| commit | f2b5a87d6dc6d3468828d48929583d950690a40b (patch) | |
| tree | 22ec58572e255d6081163199ca2f2d60365c7b6c /unix | |
| parent | b68e469c6fcec04a86935ae2e8853197213f40db (diff) | |
| download | tk-f2b5a87d6dc6d3468828d48929583d950690a40b.zip tk-f2b5a87d6dc6d3468828d48929583d950690a40b.tar.gz tk-f2b5a87d6dc6d3468828d48929583d950690a40b.tar.bz2 | |
As requested by Christian Werner/François Vogel and others: Undo many None -> 0 changes, in order to reduce the probability of merge conflicts with other branches.
Remark: Many usages of "None" in Tk are wrong, "NULL" should be used in many places where pointers are referenced in stead of XID's. Those places are corrected.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnix3d.c | 4 | ||||
| -rw-r--r-- | unix/tkUnixDefault.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/unix/tkUnix3d.c b/unix/tkUnix3d.c index 417866b..14f5827 100644 --- a/unix/tkUnix3d.c +++ b/unix/tkUnix3d.c @@ -47,7 +47,7 @@ TkBorder * TkpGetBorder(void) { UnixBorder *borderPtr = (UnixBorder *) ckalloc(sizeof(UnixBorder)); - borderPtr->solidGC = None; + borderPtr->solidGC = NULL; return (TkBorder *) borderPtr; } @@ -215,7 +215,7 @@ Tk_3DHorizontalBevel( Display *display = Tk_Display(tkwin); int bottom, halfway, x1, x2, x1Delta, x2Delta; UnixBorder *unixBorderPtr = (UnixBorder *) borderPtr; - GC topGC = None, bottomGC = None; + GC topGC = NULL, bottomGC = NULL; /* Initializations needed only to prevent * compiler warnings. */ 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" |