X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=test%2Fins_wide.c;h=35d0503edbe3cb1eb93d02b22a388a6051f5883e;hb=5e36f11feab6f790e0cc6f2c882a67b7b65e3b6b;hp=60de9249ba8e4119786c18cd69389e527c548fc9;hpb=52aa842907b31bb56fb5133da3f023b45bd4355f;p=ncurses.git diff --git a/test/ins_wide.c b/test/ins_wide.c index 60de9249..35d0503e 100644 --- a/test/ins_wide.c +++ b/test/ins_wide.c @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: ins_wide.c,v 1.13 2010/11/13 23:40:32 tom Exp $ + * $Id: ins_wide.c,v 1.16 2011/12/10 19:54:43 tom Exp $ * * Demonstrate the wins_wstr() and wins_wch functions. * Thomas Dickey - 2002/11/23 @@ -74,7 +74,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: @@ -96,7 +96,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); @@ -228,8 +228,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];