/****************************************************************************
- * Copyright (c) 2008-2009,2010 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 *
* authorization. *
****************************************************************************/
/*
- * $Id: insdelln.c,v 1.5 2010/11/13 23:39:38 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
*/
delwin(win1);
touchwin(win);
} else {
+ if (win1)
+ delwin(win1);
beep();
}
}
init_status(win, &st);
do {
- (void) wattrset(win, 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)
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)