ncurses 6.0 - patch 20151226
[ncurses.git] / test / ins_wide.c
index 6e4e7275cdf6723f75db63e865f32a86640c19a8..8e7c123b5ffeac8a02176ec3057070a3b0fdd6f2 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2010,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2012,2014 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: ins_wide.c,v 1.19 2012/12/09 01:13:56 tom Exp $
+ * $Id: ins_wide.c,v 1.21 2014/08/02 17:24:55 tom Exp $
  *
  * Demonstrate the wins_wstr() and wins_wch functions.
  * Thomas Dickey - 2002/11/23
@@ -132,7 +132,7 @@ ColOf(wchar_t *buffer, int length, int margin)
            result += 2;
            break;
        default:
-           result += wcwidth(ch);
+           result += wcwidth((wchar_t) ch);
            if (ch < 32)
                ++result;
            break;
@@ -294,11 +294,13 @@ test_inserts(int level)
        case key_RECUR:
            test_inserts(level + 1);
 
-           touchwin(look);
+           if (look)
+               touchwin(look);
            touchwin(work);
            touchwin(show);
 
-           wnoutrefresh(look);
+           if (look)
+               wnoutrefresh(look);
            wnoutrefresh(work);
            wnoutrefresh(show);
 
@@ -388,7 +390,7 @@ test_inserts(int level)
            }
            break;
        default:
-           buffer[length++] = ch;
+           buffer[length++] = (wchar_t) ch;
            buffer[length] = '\0';
 
            /* put the string in, one character at a time */