ncurses 5.9 - patch 20110924

[ncurses.git] / test / test_addstr.c

diff --git a/test/test_addstr.c b/test/test_addstr.c
index d4c0425ec66a9d1f405afee1a3add01761d4dfc5..5cc184a2d4b23a2e806d78b9c6c5040555376d06 100644 (file)
--- a/test/test_addstr.c
+++ b/test/test_addstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2009 Free Software Foundation, Inc.                        *
+ * Copyright (c) 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            *
  *                                                                          *
  * 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.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: test_addstr.c,v 1.3 2009/10/10 16:01:41 tom Exp $
+ * $Id: test_addstr.c,v 1.6 2010/12/12 00:17:37 tom Exp $

  *
  * Demonstrate the waddstr() and waddch functions.
  * Thomas Dickey - 2009/9/12
  *
  * Demonstrate the waddstr() and waddch functions.
  * Thomas Dickey - 2009/9/12


@@ -38,16 +38,12 @@
 
 #define AddNStr    addnstr
 #define AddStr     addstr
 
 #define AddNStr    addnstr
 #define AddStr     addstr

-#define MvAddNStr  mvaddnstr
-#define MvAddStr   mvaddstr
-#define MvWAddNStr mvwaddnstr
-#define MvWAddStr  mvwaddstr
+#define MvAddNStr  (void) mvaddnstr
+#define MvWAddNStr (void) mvwaddnstr

 #define WAddNStr   waddnstr
 #define WAddStr    waddstr
 
 #define AddCh      addch
 #define WAddNStr   waddnstr
 #define WAddStr    waddstr
 
 #define AddCh      addch

-#define MvAddCh    mvaddch
-#define MvWAddCh   mvwaddch

 #define WAddCh     waddch
 
 #define MY_TABSIZE 8
 #define WAddCh     waddch
 
 #define MY_TABSIZE 8


@@ -66,7 +62,7 @@ static int n_opt = -1;
 static void
 legend(WINDOW *win, int level, Options state, char *buffer, int length)
 {
 static void
 legend(WINDOW *win, int level, Options state, char *buffer, int length)
 {

-    NCURSES_CONST char *showstate;
+    const char *showstate;

 
     switch (state) {
     default:
 
     switch (state) {
     default:


@@ -88,7 +84,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length)
     wprintw(win,
            "The Strings/Chars displays should match.  Enter any characters, except:\n");
     wprintw(win,
     wprintw(win,
            "The Strings/Chars displays should match.  Enter any characters, except:\n");
     wprintw(win,

-           "down-arrow or ^N to repeat on next line, 'w' for inner window, 'q' to exit.\n");
+           "down-arrow or ^N to repeat on next line, ^W for inner window, ESC to exit.\n");

     wclrtoeol(win);
     wprintw(win, "Level %d,%s added %d characters <%s>", level,
            showstate, length, buffer);
     wclrtoeol(win);
     wprintw(win, "Level %d,%s added %d characters <%s>", level,
            showstate, length, buffer);


@@ -182,14 +178,14 @@ test_adds(int level)
     keypad(work, TRUE);
 
     for (col = margin + 1; col < COLS; col += MY_TABSIZE)
     keypad(work, TRUE);
 
     for (col = margin + 1; col < COLS; col += MY_TABSIZE)

-       mvwvline(work, row, col, '.', limit - 2);
+       MvWVLine(work, row, col, '.', limit - 2);

 
 

-    mvwvline(work, row, margin, ACS_VLINE, limit - 2);
-    mvwvline(work, row, margin + 1, ACS_VLINE, limit - 2);
+    MvWVLine(work, row, margin, ACS_VLINE, limit - 2);
+    MvWVLine(work, row, margin + 1, ACS_VLINE, limit - 2);

     limit /= 2;
 
     limit /= 2;
 

-    mvwaddstr(work, 1, 2, "String");
-    mvwaddstr(work, limit + 1, 2, "Chars");
+    MvWAddStr(work, 1, 2, "String");
+    MvWAddStr(work, limit + 1, 2, "Chars");

     wnoutrefresh(work);
 
     buffer[length = 0] = '\0';
     wnoutrefresh(work);
 
     buffer[length = 0] = '\0';