Author: pierre
Date: Sat Oct 3 05:10:42 2015
New Revision: 3827
Log:
Adapt menu to ncurses ABI 6, and clear a warning
Modified:
jhalfs/trunk/menu/Makefile
jhalfs/trunk/menu/lxdialog/menubox.c
jhalfs/trunk/menu/lxdialog/textbox.c
Modified: jhalfs/trunk/menu/Makefile
==============================================================================
--- jhalfs/trunk/menu/Makefile Sun Sep 27 05:52:55 2015 (r3826)
+++ jhalfs/trunk/menu/Makefile Sat Oct 3 05:10:42 2015 (r3827)
@@ -125,7 +125,7 @@
.PHONY: ncurses
ncurses:
- @echo "main() {}" > lxtemp.c
+ @echo "int main() {}" > lxtemp.c
@if $(HOSTCC) lxtemp.c $(LIBS) ; then \
rm -f lxtemp.c a.out; \
else \
Modified: jhalfs/trunk/menu/lxdialog/menubox.c
==============================================================================
--- jhalfs/trunk/menu/lxdialog/menubox.c Sun Sep 27 05:52:55 2015
(r3826)
+++ jhalfs/trunk/menu/lxdialog/menubox.c Sat Oct 3 05:10:42 2015
(r3827)
@@ -269,7 +269,9 @@
print_arrows(dialog, item_no, scroll,
box_y, box_x+item_x+1, menu_height);
+ wbkgdset (dialog, 0);
print_buttons (dialog, height, width, 0);
+ wbkgdset (dialog, dialog_attr & A_COLOR);
wmove (menu, choice, item_x+1);
wrefresh (menu);
@@ -390,7 +392,9 @@
button = ((key == KEY_LEFT ? --button : ++button) < 0)
? 2 : (button > 2 ? 0 : button);
+ wbkgdset (dialog, 0);
print_buttons(dialog, height, width, button);
+ wbkgdset (dialog, dialog_attr & A_COLOR);
wrefresh (menu);
break;
case ' ':
Modified: jhalfs/trunk/menu/lxdialog/textbox.c
==============================================================================
--- jhalfs/trunk/menu/lxdialog/textbox.c Sun Sep 27 05:52:55 2015
(r3826)
+++ jhalfs/trunk/menu/lxdialog/textbox.c Sat Oct 3 05:10:42 2015
(r3827)
@@ -117,7 +117,9 @@
waddstr (dialog, (char *)title);
waddch (dialog, ' ');
}
+ wbkgdset (dialog, 0);
print_button (dialog, " Exit ", height - 2, width / 2 - 4, TRUE);
+ wbkgdset (dialog, dialog_attr & A_COLOR);
wnoutrefresh (dialog);
getyx (dialog, cur_y, cur_x); /* Save cursor position */
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
