diff options
| author | dteske <dteske@FreeBSD.org> | 2013-09-24 14:52:43 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2013-09-24 14:52:43 +0000 |
| commit | 6633bf70ed24c304037f64ca2f28e6ea8d2a0b47 (patch) | |
| tree | 928bd26d2edefc51e3476336efb87361f214c616 /contrib/dialog/formbox.c | |
| parent | 8a88ce9ab8eb02eeeb3167855ff0ac0f381dad7e (diff) | |
| download | FreeBSD-src-6633bf70ed24c304037f64ca2f28e6ea8d2a0b47.zip FreeBSD-src-6633bf70ed24c304037f64ca2f28e6ea8d2a0b47.tar.gz | |
Update dialog to 1.2-20130923.
Approved by: re (marius)
Diffstat (limited to 'contrib/dialog/formbox.c')
| -rw-r--r-- | contrib/dialog/formbox.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/contrib/dialog/formbox.c b/contrib/dialog/formbox.c index 6688c54..b0b207f 100644 --- a/contrib/dialog/formbox.c +++ b/contrib/dialog/formbox.c @@ -1,5 +1,5 @@ /* - * $Id: formbox.c,v 1.85 2013/03/17 15:03:41 tom Exp $ + * $Id: formbox.c,v 1.87 2013/09/02 17:02:05 tom Exp $ * * formbox.c -- implements the form (i.e, some pairs label/editbox) * @@ -915,6 +915,7 @@ dialog_form(const char *title, DIALOG_FORMITEM *listitems; DIALOG_VARS save_vars; bool show_status = FALSE; + char *help_result; dlg_save_vars(&save_vars); dialog_vars.separate_output = TRUE; @@ -954,14 +955,9 @@ dialog_form(const char *title, show_status = TRUE; break; case DLG_EXIT_HELP: - dlg_add_result("HELP "); + dlg_add_help_formitem(&result, &help_result, &listitems[choice]); show_status = dialog_vars.help_status; - if (USE_ITEM_HELP(listitems[choice].help)) { - dlg_add_string(listitems[choice].help); - result = DLG_EXIT_ITEM_HELP; - } else { - dlg_add_string(listitems[choice].name); - } + dlg_add_string(help_result); if (show_status) dlg_add_separator(); break; |
