ncurses 6.0 - patch 20160220

[ncurses.git] / test / insdelln.c

diff --git a/test/insdelln.c b/test/insdelln.c
index ffca6aff68f28973039a4711a276c5bc6247c4be..34fb388db7f60fe5e75f87e8e4d71c9ef055734a 100644 (file)
--- a/test/insdelln.c
+++ b/test/insdelln.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2008-2010,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 2008-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            *
  *                                                                          *
  * 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.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: insdelln.c,v 1.6 2012/06/09 20:29:33 tom Exp $
+ * $Id: insdelln.c,v 1.9 2014/08/02 23:09:32 tom Exp $

  *
  * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
  */
  *
  * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
  */


@@ -175,6 +175,8 @@ do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
        delwin(win1);
        touchwin(win);
     } else {
        delwin(win1);
        touchwin(win);
     } else {

+       if (win1)
+           delwin(win1);

        beep();
     }
 }
        beep();
     }
 }


@@ -300,7 +302,7 @@ test_winsdelln(WINDOW *win)
     init_status(win, &st);
 
     do {
     init_status(win, &st);
 
     do {

-       (void) wattrset(win, (int) (st.attr | (attr_t) COLOR_PAIR(st.pair)));
+       (void) wattrset(win, AttrArg(COLOR_PAIR(st.pair), st.attr));

        switch (st.ch) {
        case 'i':
            for (n = 0; n < st.count; ++n)
        switch (st.ch) {
        case 'i':
            for (n = 0; n < st.count; ++n)


@@ -341,7 +343,7 @@ test_insdelln(void)
     init_status(stdscr, &st);
 
     do {
     init_status(stdscr, &st);
 
     do {

-       (void) attrset(st.attr | (attr_t) COLOR_PAIR(st.pair));
+       (void) attrset(AttrArg(COLOR_PAIR(st.pair), st.attr));

        switch (st.ch) {
        case 'i':
            for (n = 0; n < st.count; ++n)
        switch (st.ch) {
        case 'i':
            for (n = 0; n < st.count; ++n)