ncurses 5.9 - patch 20130309

[ncurses.git] / panel / p_delete.c

diff --git a/panel/p_delete.c b/panel/p_delete.c
index aabccdc428f15b8700f0b80d257bd18378248fa8..39b055377c166698746025cc14e6f7c5ec8414fd 100644 (file)
--- a/panel/p_delete.c
+++ b/panel/p_delete.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-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            *
@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995                    *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Juergen Pfeifer                         1999,2008               *
  ****************************************************************************/
 
 /* p_delete.c
@@ -36,18 +37,25 @@
  */
 #include "panel.priv.h"
 
-MODULE_ID("$Id: p_delete.c,v 1.2 1998/02/11 12:14:01 tom Exp $")
+MODULE_ID("$Id: p_delete.c,v 1.10 2010/01/23 21:22:16 tom Exp $")
 
-int
-del_panel(PANEL *pan)
+NCURSES_EXPORT(int)
+del_panel(PANEL * pan)
 {
-  if(pan)
+  int err = OK;
+
+  T((T_CALLED("del_panel(%p)"), (void *)pan));
+  if (pan)
     {
       dBug(("--> del_panel %s", USER_PTR(pan->user)));
-      if(_nc_panel_is_linked(pan))
-       (void)hide_panel(pan);
-      free((void *)pan);
-      return(OK);
+      {
+       GetHook(pan);
+       HIDE_PANEL(pan, err, OK);
+       free((void *)pan);
+      }
     }
-  return(ERR);
+  else
+    err = ERR;
+
+  returnCode(err);
 }