summaryrefslogtreecommitdiffstats
path: root/contrib/dialog/menubox.c
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2013-09-24 14:52:43 +0000
committerdteske <dteske@FreeBSD.org>2013-09-24 14:52:43 +0000
commit6633bf70ed24c304037f64ca2f28e6ea8d2a0b47 (patch)
tree928bd26d2edefc51e3476336efb87361f214c616 /contrib/dialog/menubox.c
parent8a88ce9ab8eb02eeeb3167855ff0ac0f381dad7e (diff)
downloadFreeBSD-src-6633bf70ed24c304037f64ca2f28e6ea8d2a0b47.zip
FreeBSD-src-6633bf70ed24c304037f64ca2f28e6ea8d2a0b47.tar.gz
Update dialog to 1.2-20130923.
Approved by: re (marius)
Diffstat (limited to 'contrib/dialog/menubox.c')
-rw-r--r--contrib/dialog/menubox.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/contrib/dialog/menubox.c b/contrib/dialog/menubox.c
index 3117443..518393e 100644
--- a/contrib/dialog/menubox.c
+++ b/contrib/dialog/menubox.c
@@ -1,9 +1,9 @@
/*
- * $Id: menubox.c,v 1.145 2012/12/30 21:11:02 tom Exp $
+ * $Id: menubox.c,v 1.148 2013/09/02 17:15:13 tom Exp $
*
* menubox.c -- implements the menu box
*
- * Copyright 2000-2011,2012 Thomas E. Dickey
+ * Copyright 2000-2012,2013 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public Licens, version 2.1e
@@ -191,19 +191,16 @@ input_menu_edit(ALL_DATA * data,
static int
handle_button(int code, DIALOG_LISTITEM * items, int choice)
{
+ char *help_result;
+
switch (code) {
case DLG_EXIT_OK: /* FALLTHRU */
case DLG_EXIT_EXTRA:
dlg_add_string(items[choice].name);
break;
case DLG_EXIT_HELP:
- dlg_add_result("HELP ");
- if (USE_ITEM_HELP(items[choice].help)) {
- dlg_add_string(items[choice].help);
- code = DLG_EXIT_ITEM_HELP;
- } else {
- dlg_add_string(items[choice].name);
- }
+ dlg_add_help_listitem(&code, &help_result, &items[choice]);
+ dlg_add_string(help_result);
break;
}
return code;
OpenPOWER on IntegriCloud