diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-05 15:37:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-05 15:37:47 (GMT) |
| commit | af930f542b494c26a51841c6c3ba8b38ba84d378 (patch) | |
| tree | fffbe946b42d4da43a33e7f776913cb877a1a110 /generic/tkMenu.c | |
| parent | 959d11df46f93807f4e8d3c99264002a054ae98a (diff) | |
| parent | 2469ec79a7eedc59f089fe069bb239daaf988a82 (diff) | |
| download | tk-af930f542b494c26a51841c6c3ba8b38ba84d378.zip tk-af930f542b494c26a51841c6c3ba8b38ba84d378.tar.gz tk-af930f542b494c26a51841c6c3ba8b38ba84d378.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkMenu.c')
| -rw-r--r-- | generic/tkMenu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c index bc248c2..1e9fa40 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -147,8 +147,8 @@ static const Tk_OptionSpec tkBasicMenuEntryConfigSpecs[] = { offsetof(TkMenuEntry, labelPtr), TCL_INDEX_NONE, 0, NULL, 0}, {TK_OPTION_STRING_TABLE, "-state", NULL, NULL, DEF_MENU_ENTRY_STATE, - TCL_INDEX_NONE, offsetof(TkMenuEntry, state), 0, - tkStateStrings, 0}, + TCL_INDEX_NONE, offsetof(TkMenuEntry, state), + 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} @@ -217,8 +217,8 @@ static const Tk_OptionSpec tkTearoffEntryConfigSpecs[] = { DEF_MENU_ENTRY_BG, 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, - tkStateStrings, 0}, + DEF_MENU_ENTRY_STATE, TCL_INDEX_NONE, offsetof(TkMenuEntry, state), + 0, tkStateStrings, 0}, {TK_OPTION_END, NULL, NULL, NULL, 0, 0, 0, 0, NULL, 0} }; @@ -294,8 +294,8 @@ static const Tk_OptionSpec tkMenuConfigSpecs[] = { DEF_MENU_TITLE, offsetof(TkMenu, titlePtr), TCL_INDEX_NONE, TK_OPTION_NULL_OK, NULL, 0}, {TK_OPTION_STRING_TABLE, "-type", "type", "Type", - DEF_MENU_TYPE, offsetof(TkMenu, menuTypePtr), TCL_INDEX_NONE, 0, - (ClientData) menuTypeStrings, 0}, + DEF_MENU_TYPE, offsetof(TkMenu, menuTypePtr), TCL_INDEX_NONE, + 0, menuTypeStrings, 0}, {TK_OPTION_END, NULL, NULL, NULL, 0, 0, 0, 0, NULL, 0} }; |