X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fnewdemo.c;fp=test%2Fnewdemo.c;h=a15e16966f5e96a21d1373e1d534aaac1587518d;hp=8187982be2932d5b601bed9769ce3e546eacc465;hb=92e187a3459ab7ce1613a3684ca6642447c73620;hpb=11dead39816318fe9601e27756b9497caf7ff490

diff --git a/test/newdemo.c b/test/newdemo.c
index 8187982b..a15e1696 100644
--- a/test/newdemo.c
+++ b/test/newdemo.c
@@ -2,7 +2,7 @@
  *  newdemo.c	-	A demo program using PDCurses. The program illustrate
  *  	 		the use of colours for text output.
  *
- * $Id: newdemo.c,v 1.32 2009/08/29 18:47:26 tom Exp $
+ * $Id: newdemo.c,v 1.33 2010/05/01 19:07:34 tom Exp $
  */
 
 #include <test.priv.h>
@@ -122,17 +122,17 @@ SubWinTest(WINDOW *win)
 
     set_colors(swin1, 8, COLOR_RED, COLOR_BLUE);
     werase(swin1);
-    mvwaddstr(swin1, 0, 3, "Sub-window 1");
+    MvWAddStr(swin1, 0, 3, "Sub-window 1");
     wrefresh(swin1);
 
     set_colors(swin2, 9, COLOR_CYAN, COLOR_MAGENTA);
     werase(swin2);
-    mvwaddstr(swin2, 0, 3, "Sub-window 2");
+    MvWAddStr(swin2, 0, 3, "Sub-window 2");
     wrefresh(swin2);
 
     set_colors(swin3, 10, COLOR_YELLOW, COLOR_GREEN);
     werase(swin3);
-    mvwaddstr(swin3, 0, 3, "Sub-window 3");
+    MvWAddStr(swin3, 0, 3, "Sub-window 3");
     wrefresh(swin3);
 
     delwin(swin1);
@@ -192,13 +192,13 @@ BouncingBalls(WINDOW *win)
 	y3 = bounce(y3, &yd3, h);
 
 	set_colors(win, 11, COLOR_RED, COLOR_BLUE);
-	mvwaddch(win, y1, x1, 'O');
+	MvWAddCh(win, y1, x1, 'O');
 
 	set_colors(win, 12, COLOR_BLUE, COLOR_RED);
-	mvwaddch(win, y2, x2, '*');
+	MvWAddCh(win, y2, x2, '*');
 
 	set_colors(win, 13, COLOR_YELLOW, COLOR_WHITE);
-	mvwaddch(win, y3, x3, '@');
+	MvWAddCh(win, y3, x3, '@');
 
 	wmove(win, 0, 0);
 	wrefresh(win);
@@ -251,7 +251,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 	for (i = 0; i < 5000; ++i) {
 	    x = rand() % (width - 2) + 1;
 	    y = rand() % (height - 2) + 1;
-	    mvwaddch(win, y, x, c);
+	    MvWAddCh(win, y, x, c);
 	    wrefresh(win);
 	    nodelay(win, TRUE);
 	    if (wgetch(win) != ERR)
@@ -276,7 +276,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 	use_colors(win, 4, A_BOLD);
 	i = 0;
 	while (*AusMap[i]) {
-	    mvwaddstr(win, i + 1, 8, AusMap[i]);
+	    MvWAddStr(win, i + 1, 8, AusMap[i]);
 	    wrefresh(win);
 	    delay_output(50);
 	    ++i;
@@ -284,7 +284,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
 	set_colors(win, 5, COLOR_BLUE, COLOR_WHITE);
 	use_colors(win, 5, A_BLINK);
-	mvwaddstr(win, height - 2, 6, " PDCurses 2.1 for DOS, OS/2 and Unix");
+	MvWAddStr(win, height - 2, 6, " PDCurses 2.1 for DOS, OS/2 and Unix");
 	wrefresh(win);
 
 	/* Draw running messages */
@@ -300,9 +300,9 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 	    }
 
 	    if (i < w)
-		mvwaddnstr(win, height / 2, w - i, buffer, i);
+		(void) mvwaddnstr(win, height / 2, w - i, buffer, i);
 	    else
-		mvwaddnstr(win, height / 2, 1, buffer, w);
+		(void) mvwaddnstr(win, height / 2, 1, buffer, w);
 
 	    wrefresh(win);
 	    nodelay(win, TRUE);
@@ -326,14 +326,14 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 		break;
 	    save[j++] = c = k;
 	    c &= A_CHARTEXT;
-	    mvwaddch(win, 4, i, c);
+	    MvWAddCh(win, 4, i, c);
 	}
 	wrefresh(win);
 
 	/* Put a message up wait for a key */
 	i = height - 2;
 	use_colors(win, 5, A_NORMAL);
-	mvwaddstr(win, i, 5, " Type a key to continue or 'Q' to quit ");
+	MvWAddStr(win, i, 5, " Type a key to continue or 'Q' to quit ");
 	wrefresh(win);
 
 	if (WaitForUser(win) == 1)
@@ -341,14 +341,14 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
 	j = 0;			/* Restore the old line */
 	for (i = 2; i < width - 4; ++i)
-	    mvwaddch(win, 4, i, save[j++]);
+	    MvWAddCh(win, 4, i, save[j++]);
 	wrefresh(win);
 
 	BouncingBalls(win);
 	/* Put a message up wait for a key */
 	i = height - 2;
 	use_colors(win, 5, A_NORMAL);
-	mvwaddstr(win, i, 5, " Type a key to continue or 'Q' to quit ");
+	MvWAddStr(win, i, 5, " Type a key to continue or 'Q' to quit ");
 	wrefresh(win);
 	if (WaitForUser(win) == 1)
 	    break;