ncurses 5.7 - patch 20090523

[ncurses.git] / ncurses / base / lib_delwin.c

diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index e7a4b89df2d4a470136166d243061f8cf45d437d..59fa3f772d2afb9e9cd5a6608bae881b09aad2b5 100644 (file)
--- a/ncurses/base/lib_delwin.c
+++ b/ncurses/base/lib_delwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2009 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            *
@@ -29,6 +29,8 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
+ *     and: Juergen Pfeifer                         2008                    *
  ****************************************************************************/
 
 /*
@@ -40,15 +42,18 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_delwin.c,v 1.18 2009/05/09 18:30:57 tom Exp $")
+MODULE_ID("$Id: lib_delwin.c,v 1.19 2009/05/23 19:56:55 tom Exp $")
 
 static bool
 cannot_delete(WINDOW *win)
 {
     WINDOWLIST *p;
     bool result = TRUE;
+#ifdef USE_SP_WINDOWLIST
+    SCREEN *sp = _nc_screen_of(win);
+#endif
 
-    for (each_window(SP, p)) {
+    for (each_window(SP_PARM, p)) {
        if (&(p->win) == win) {
            result = FALSE;
        } else if ((p->win._flags & _SUBWIN) != 0
@@ -72,11 +77,13 @@ delwin(WINDOW *win)
            || cannot_delete(win)) {
            result = ERR;
        } else {
-
+#if NCURSES_SP_FUNCS
+           SCREEN *sp = _nc_screen_of(win);
+#endif
            if (win->_flags & _SUBWIN)
                touchwin(win->_parent);
-           else if (curscr != 0)
-               touchwin(curscr);
+           else if (CurScreen(SP_PARM) != 0)
+               touchwin(CurScreen(SP_PARM));
 
            result = _nc_freewin(win);
        }