ncurses 5.9 - patch 20140322

[ncurses.git] / form / frm_sub.c

diff --git a/form/frm_sub.c b/form/frm_sub.c
index a5912ac35115c04fcce2ed72da87ebf19cd425e3..1ab131a593c839befadd48062c3121a772053bd8 100644 (file)
--- a/form/frm_sub.c
+++ b/form/frm_sub.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            *
@@ -27,12 +27,12 @@
  ****************************************************************************/
 
 /****************************************************************************
- *   Author: Juergen Pfeifer <Juergen.Pfeifer@T-Online.de> 1995,1997        *
+ *   Author:  Juergen Pfeifer, 1995-1997,2009                               *
  ****************************************************************************/
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: frm_sub.c,v 1.2 1998/02/11 12:13:44 tom Exp $")
+MODULE_ID("$Id: frm_sub.c,v 1.12 2010/01/23 21:14:36 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
@@ -43,14 +43,26 @@ MODULE_ID("$Id: frm_sub.c,v 1.2 1998/02/11 12:13:44 tom Exp $")
 |   Return Values :  E_OK       - success
 |                    E_POSTED   - form is posted
 +--------------------------------------------------------------------------*/
-int set_form_sub(FORM * form, WINDOW * win)
+NCURSES_EXPORT(int)
+set_form_sub(FORM *form, WINDOW *win)
 {
-  if (form && (form->status & _POSTED))        
+  T((T_CALLED("set_form_sub(%p,%p)"), (void *)form, (void *)win));
+
+  if (form && (form->status & _POSTED))
     RETURN(E_POSTED);
+  else
+    {
+#if NCURSES_SP_FUNCS
+      FORM *f = Normalize_Form(form);
 
-  Normalize_Form( form )->sub = win;
-  RETURN(E_OK);
-}      
+      f->sub = win ? win : StdScreen(Get_Form_Screen(f));
+      RETURN(E_OK);
+#else
+      Normalize_Form(form)->sub = win;
+      RETURN(E_OK);
+#endif
+    }
+}
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
@@ -60,10 +72,15 @@ int set_form_sub(FORM * form, WINDOW * win)
 |
 |   Return Values :  The pointer to the Subwindow.
 +--------------------------------------------------------------------------*/
-WINDOW *form_sub(const FORM * form)
+NCURSES_EXPORT(WINDOW *)
+form_sub(const FORM *form)
 {
-  const FORM* f = Normalize_Form( form );
-  return Get_Form_Window(f);
+  const FORM *f;
+
+  T((T_CALLED("form_sub(%p)"), (const void *)form));
+
+  f = Normalize_Form(form);
+  returnWin(Get_Form_Window(f));
 }
 
 /* frm_sub.c ends here */