/****************************************************************************
- * 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 *
* authorization. *
****************************************************************************/
/*
- * $Id: test_add_wchstr.c,v 1.7 2009/09/13 00:00:28 tom Exp $
+ * $Id: test_add_wchstr.c,v 1.9 2010/11/13 21:14:50 tom Exp $
*
* Demonstrate the waddwchstr() and wadd_wch functions.
* Thomas Dickey - 2009/9/12
#define WIDE_LINEDATA
#include <linedata.h>
+#undef MvAddCh
+#undef MvAddStr
+#undef MvWAddCh
+#undef MvWAddStr
+
/* definitions to make it simpler to compare with test_addstr.c */
#define AddNStr add_wchnstr
#define AddStr add_wchstr
-#define MvAddNStr mvadd_wchnstr
-#define MvAddStr mvadd_wchstr
-#define MvWAddNStr mvwadd_wchnstr
-#define MvWAddStr mvwadd_wchstr
+#define MvAddNStr (void) mvadd_wchnstr
+#define MvAddStr (void) mvadd_wchstr
+#define MvWAddNStr (void) mvwadd_wchnstr
+#define MvWAddStr (void) mvwadd_wchstr
#define WAddNStr wadd_wchnstr
#define WAddStr wadd_wchstr
{
wchar_t tmp_wchar[2];
- tmp_wchar[0] = source;
+ tmp_wchar[0] = (wchar_t) source;
tmp_wchar[1] = 0;
if (setcchar(target, tmp_wchar, A_NORMAL, 0, (void *) 0) == ERR) {
beep();
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;
- mvwadd_wchstr(work, 1, 2, ChStr("String"));
- mvwadd_wchstr(work, limit + 1, 2, ChStr("Chars"));
+ (void) mvwadd_wchstr(work, 1, 2, ChStr("String"));
+ (void) mvwadd_wchstr(work, limit + 1, 2, ChStr("Chars"));
wnoutrefresh(work);
buffer[length = 0] = '\0';
switch (option) {
case oDefault:
if (move(limit + row, col) != ERR) {
- AddCh(ch);
+ AddCh((chtype) ch);
}
break;
case oMove:
- MvAddCh(limit + row, col, ch);
+ MvAddCh(limit + row, col, (chtype) ch);
break;
case oWindow:
if (wmove(work, limit + row, col) != ERR) {
- WAddCh(work, ch);
+ WAddCh(work, (chtype) ch);
}
break;
case oMoveWindow:
- MvWAddCh(work, limit + row, col, ch);
+ MvWAddCh(work, limit + row, col, (chtype) ch);
break;
}