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/tkMenubutton.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/tkMenubutton.c')
| -rw-r--r-- | generic/tkMenubutton.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c index e81342e..0c80aef 100644 --- a/generic/tkMenubutton.c +++ b/generic/tkMenubutton.c @@ -36,24 +36,6 @@ static const char *const directionStrings[] = { }; /* - * The following table defines the legal values for the -state option. It is - * used together with the "enum state" declaration in tkMenubutton.h. - */ - -static const char *const stateStrings[] = { - "active", "disabled", "normal", NULL -}; - -/* - * The following table defines the legal values for the -compound option. It - * is used with the "enum compound" declaration in tkMenuButton.h - */ - -static const char *const compoundStrings[] = { - "bottom", "center", "left", "none", "right", "top", NULL -}; - -/* * Information used for parsing configuration specs: */ @@ -132,10 +114,10 @@ static const Tk_OptionSpec optionSpecs[] = { 0, 0, 0}, {TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound", DEF_BUTTON_COMPOUND, TCL_INDEX_NONE, offsetof(TkMenuButton, compound), 0, - compoundStrings, 0}, + tkCompoundStrings, 0}, {TK_OPTION_STRING_TABLE, "-state", "state", "State", DEF_MENUBUTTON_STATE, TCL_INDEX_NONE, offsetof(TkMenuButton, state), - 0, stateStrings, 0}, + 0, tkStateStrings, 0}, {TK_OPTION_STRING, "-takefocus", "takeFocus", "TakeFocus", DEF_MENUBUTTON_TAKE_FOCUS, TCL_INDEX_NONE, offsetof(TkMenuButton, takeFocus), TK_OPTION_NULL_OK, 0, 0}, |