X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest_addwstr.c;h=42db92e89b259e1d8ac68cb3ac7036b7fb39a0d5;hp=a7fe8a21c73ab26a3514bdcaa3dda6bda6ae45fb;hb=92e187a3459ab7ce1613a3684ca6642447c73620;hpb=11dead39816318fe9601e27756b9497caf7ff490 diff --git a/test/test_addwstr.c b/test/test_addwstr.c index a7fe8a21..42db92e8 100644 --- a/test/test_addwstr.c +++ b/test/test_addwstr.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 * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addwstr.c,v 1.2 2009/09/12 22:55:23 tom Exp $ + * $Id: test_addwstr.c,v 1.3 2010/05/01 19:13:46 tom Exp $ * * Demonstrate the waddwstr() and wadd_wch functions. * Thomas Dickey - 2009/9/12 @@ -48,13 +48,18 @@ #define WIDE_LINEDATA #include +#undef MvAddCh +#undef MvAddStr +#undef MvWAddCh +#undef MvWAddStr + /* definitions to make it simpler to compare with inserts.c */ #define AddNStr addnwstr #define AddStr addwstr -#define MvAddNStr mvaddnwstr -#define MvAddStr mvaddwstr -#define MvWAddNStr mvwaddnwstr -#define MvWAddStr mvwaddwstr +#define MvAddNStr (void) mvaddnwstr +#define MvAddStr (void) mvaddwstr +#define MvWAddNStr (void) mvwaddnwstr +#define MvWAddStr (void) mvwaddwstr #define WAddNStr waddnwstr #define WAddStr waddwstr @@ -258,14 +263,14 @@ test_inserts(int level) 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; - mvwaddstr(work, 1, 2, "String"); - mvwaddstr(work, limit + 1, 2, "Chars"); + (void) mvwaddstr(work, 1, 2, "String"); + (void) mvwaddstr(work, limit + 1, 2, "Chars"); wnoutrefresh(work); buffer[length = 0] = '\0';