ncurses 5.9 - patch 20111217

[ncurses.git] / test / test_addwstr.c

diff --git a/test/test_addwstr.c b/test/test_addwstr.c
index 5a45a9c1a750dd2a0b7ccf10f287c6d6512d639e..7f5cc275365bbc3e66a9a6ee92af58a1e4fc9880 100644 (file)
--- a/test/test_addwstr.c
+++ b/test/test_addwstr.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addwstr.c,v 1.4 2010/11/13 21:13:53 tom Exp $
+ * $Id: test_addwstr.c,v 1.7 2011/12/10 19:55:10 tom Exp $
  *
  * Demonstrate the waddwstr() and wadd_wch functions.
  * Thomas Dickey - 2009/9/12
@@ -79,7 +79,7 @@ static int n_opt = -1;
 static void
 legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
 {
-    NCURSES_CONST char *showstate;
+    const char *showstate;
 
     switch (state) {
     default:
@@ -101,7 +101,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
     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 inserted %d characters <", level,
            showstate, length);
@@ -233,8 +233,9 @@ test_inserts(int level)
     WINDOW *work = 0;
     WINDOW *show = 0;
     int margin = (2 * MY_TABSIZE) - 1;
-    Options option = ((m_opt ? oMove : oDefault)
-                     | ((w_opt || (level > 0)) ? oWindow : oDefault));
+    Options option = (Options) ((int) (m_opt ? oMove : oDefault)
+                               | (int) ((w_opt || (level > 0))
+                                        ? oWindow : oDefault));
 
     if (first) {
        static char cmd[80];