X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=test%2Fdemo_forms.c;h=a649a5ceb101cbfb465778559c3a5a84ebe00b43;hb=f9d358b4f3cf9b44727a0ee5c08f8ca6ae4e3821;hp=cbfc64b4db9613fad2eaf927e5a4e653bbb67cf7;hpb=26522e4669dbf45cba32138b5d81c6c292e88e60;p=ncurses.git diff --git a/test/demo_forms.c b/test/demo_forms.c index cbfc64b4..a649a5ce 100644 --- a/test/demo_forms.c +++ b/test/demo_forms.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2003-2008,2009 Free Software Foundation, Inc. * + * Copyright (c) 2003-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_forms.c,v 1.32 2009/05/30 16:52:42 tom Exp $ + * $Id: demo_forms.c,v 1.35 2010/05/01 21:56:10 tom Exp $ * * Demonstrate a variety of functions from the form library. * Thomas Dickey - 2003/4/26 @@ -175,7 +175,7 @@ erase_form(FORM * f) static void show_insert_mode(bool insert_mode) { - mvaddstr(5, 57, (insert_mode + MvAddStr(5, 57, (insert_mode ? "form_status: insert " : "form_status: overlay")); } @@ -307,13 +307,13 @@ show_current_field(WINDOW *win, FORM * form) } waddch(win, ' '); - wattrset(win, field_fore(field)); + (void) wattrset(win, field_fore(field)); waddstr(win, "fore"); wattroff(win, field_fore(field)); waddch(win, '/'); - wattrset(win, field_back(field)); + (void) wattrset(win, field_back(field)); waddstr(win, "back"); wattroff(win, field_back(field)); @@ -324,7 +324,7 @@ show_current_field(WINDOW *win, FORM * form) for (nbuf = 0; nbuf <= 2; ++nbuf) { if ((buffer = field_buffer(field, nbuf)) != 0) { wprintw(win, "buffer %d:", nbuf); - wattrset(win, A_REVERSE); + (void) wattrset(win, A_REVERSE); waddstr(win, buffer); wattroff(win, A_REVERSE); waddstr(win, "\n"); @@ -351,7 +351,7 @@ demo_forms(void) help_edit_field(); - mvaddstr(4, 57, "Forms Entry Test"); + MvAddStr(4, 57, "Forms Entry Test"); show_insert_mode(TRUE); refresh(); @@ -423,7 +423,7 @@ demo_forms(void) set_field_buffer(f[n - 1], 1, "Hello\nWorld!"); } - f[n++] = (FIELD *) 0; + f[n] = (FIELD *) 0; if ((form = new_form(f)) != 0) {