diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-03 20:41:06 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-03 20:41:06 (GMT) |
| commit | 16e762c07d7e4052ad584723a65851d7ced2a31b (patch) | |
| tree | b896e61fb86a2f3ae73c04f306ebfbaa6b2bea7c /generic/tkMenu.c | |
| parent | d4d5bf0480d12e1721c38783c0d76fdfb9103614 (diff) | |
| parent | e5491193b5d773f05acdd08d31cadc621f85a92d (diff) | |
| download | tk-16e762c07d7e4052ad584723a65851d7ced2a31b.zip tk-16e762c07d7e4052ad584723a65851d7ced2a31b.tar.gz tk-16e762c07d7e4052ad584723a65851d7ced2a31b.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkMenu.c')
| -rw-r--r-- | generic/tkMenu.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c index 8958c51..bc248c2 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -101,21 +101,10 @@ TCL_DECLARE_MUTEX(menuMutex) * to update code in TkpMenuInit that changes the font string entry. */ -static const char *const menuStateStrings[] = {"active", "normal", "disabled", NULL}; - static const char *const menuEntryTypeStrings[] = { "cascade", "checkbutton", "command", "radiobutton", "separator", NULL }; -/* - * The following table defines the legal values for the -compound option. It - * is used with the "enum compound" declaration in tkMenu.h - */ - -static const char *const compoundStrings[] = { - "bottom", "center", "left", "none", "right", "top", NULL -}; - static const Tk_OptionSpec tkBasicMenuEntryConfigSpecs[] = { {TK_OPTION_BORDER, "-activebackground", NULL, NULL, DEF_MENU_ENTRY_ACTIVE_BG, offsetof(TkMenuEntry, activeBorderPtr), TCL_INDEX_NONE, @@ -140,7 +129,7 @@ static const Tk_OptionSpec tkBasicMenuEntryConfigSpecs[] = { offsetof(TkMenuEntry, commandPtr), TCL_INDEX_NONE, TK_OPTION_NULL_OK, NULL, 0}, {TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound", DEF_MENU_ENTRY_COMPOUND, TCL_INDEX_NONE, offsetof(TkMenuEntry, compound), 0, - (ClientData) compoundStrings, 0}, + tkCompoundStrings, 0}, {TK_OPTION_FONT, "-font", NULL, NULL, DEF_MENU_ENTRY_FONT, offsetof(TkMenuEntry, fontPtr), TCL_INDEX_NONE, TK_OPTION_NULL_OK, NULL, 0}, @@ -159,7 +148,7 @@ static const Tk_OptionSpec tkBasicMenuEntryConfigSpecs[] = { {TK_OPTION_STRING_TABLE, "-state", NULL, NULL, DEF_MENU_ENTRY_STATE, TCL_INDEX_NONE, offsetof(TkMenuEntry, state), 0, - (ClientData) menuStateStrings, 0}, + tkStateStrings, 0}, {TK_OPTION_INDEX, "-underline", NULL, NULL, TK_OPTION_UNDERLINE_DEF(TkMenuEntry, underline), 0}, {TK_OPTION_END, NULL, NULL, NULL, 0, 0, 0, 0, NULL, 0} @@ -229,7 +218,7 @@ static const Tk_OptionSpec tkTearoffEntryConfigSpecs[] = { offsetof(TkMenuEntry, borderPtr), TCL_INDEX_NONE, TK_OPTION_NULL_OK, NULL, 0}, {TK_OPTION_STRING_TABLE, "-state", NULL, NULL, DEF_MENU_ENTRY_STATE, TCL_INDEX_NONE, offsetof(TkMenuEntry, state), 0, - (ClientData) menuStateStrings, 0}, + tkStateStrings, 0}, {TK_OPTION_END, NULL, NULL, NULL, 0, 0, 0, 0, NULL, 0} }; |