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 /generic/tkMenu.h | |
| parent | 65b61144b87cb08978118bcc11ddbf96768c02f4 (diff) | |
| parent | 7b3b30d439640b2474a81ff1b97c8ae264811165 (diff) | |
| download | tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.zip tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.tar.gz tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkMenu.h')
| -rw-r--r-- | generic/tkMenu.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkMenu.h b/generic/tkMenu.h index 6d51a72..802781a 100644 --- a/generic/tkMenu.h +++ b/generic/tkMenu.h @@ -75,8 +75,8 @@ typedef struct TkMenuEntry { * of character to underline (-1 means don't * underline anything). */ Tcl_Obj *underlinePtr; /* Index of character to underline. */ - Tcl_Obj *bitmapPtr; /* Bitmap to display in menu entry, or None. - * If not None then label is ignored. */ + Tcl_Obj *bitmapPtr; /* Bitmap to display in menu entry, or NULL. + * If not NULL then label is ignored. */ Tcl_Obj *imagePtr; /* Name of image to display, or NULL. If not * NULL, bitmap, text, and textVarName are * ignored. */ @@ -175,7 +175,7 @@ typedef struct TkMenuEntry { * NULL means use overall disabledGC from menu * structure. See comments for disabledFg in * menu structure for more information. */ - GC indicatorGC; /* For drawing indicators. None means use GC + GC indicatorGC; /* For drawing indicators. NULL means use GC * from menu. */ /* @@ -340,7 +340,7 @@ typedef struct TkMenu { Tcl_Obj *takeFocusPtr; /* Value of -takefocus option; not used in the * C code, but used by keyboard traversal * scripts. Malloc'ed, but may be NULL. */ - Tcl_Obj *cursorPtr; /* Current cursor for window, or None. */ + Tcl_Obj *cursorPtr; /* Current cursor for window, or NULL. */ Tcl_Obj *postCommandPtr; /* Used to detect cycles in cascade hierarchy * trees when preprocessing postcommands on * some platforms. See PostMenu for more |