ncurses 6.2 - patch 20200912

[ncurses.git] / form / frm_sub.c

diff --git a/form/frm_sub.c b/form/frm_sub.c
index 3c34bcf3974b78d9297651a4820fbc5529faf734..f718ea4679a6382d49590af34f2cb4a89f6d3fbe 100644 (file)
--- a/form/frm_sub.c
+++ b/form/frm_sub.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -32,7 +33,7 @@
 
 #include "form.priv.h"
 
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: frm_sub.c,v 1.10 2009/04/11 18:32:47 tom Exp $")
+MODULE_ID("$Id: frm_sub.c,v 1.14 2020/05/24 01:40:20 anonymous.maarten Exp $")

 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  


@@ -43,10 +44,10 @@ MODULE_ID("$Id: frm_sub.c,v 1.10 2009/04/11 18:32:47 tom Exp $")
 |   Return Values :  E_OK       - success
 |                    E_POSTED   - form is posted
 +--------------------------------------------------------------------------*/
 |   Return Values :  E_OK       - success
 |                    E_POSTED   - form is posted
 +--------------------------------------------------------------------------*/

-NCURSES_EXPORT(int)
+FORM_EXPORT(int)

 set_form_sub(FORM *form, WINDOW *win)
 {
 set_form_sub(FORM *form, WINDOW *win)
 {

-  T((T_CALLED("set_form_sub(%p,%p)"), form, win));
+  T((T_CALLED("set_form_sub(%p,%p)"), (void *)form, (void *)win));

 
   if (form && (form->status & _POSTED))
     RETURN(E_POSTED);
 
   if (form && (form->status & _POSTED))
     RETURN(E_POSTED);


@@ -55,7 +56,7 @@ set_form_sub(FORM *form, WINDOW *win)
 #if NCURSES_SP_FUNCS
       FORM *f = Normalize_Form(form);
 
 #if NCURSES_SP_FUNCS
       FORM *f = Normalize_Form(form);
 

-      f->sub = win ? win : Get_Form_Screen(f)->_stdscr;
+      f->sub = win ? win : StdScreen(Get_Form_Screen(f));

       RETURN(E_OK);
 #else
       Normalize_Form(form)->sub = win;
       RETURN(E_OK);
 #else
       Normalize_Form(form)->sub = win;


@@ -72,12 +73,12 @@ set_form_sub(FORM *form, WINDOW *win)
 |
 |   Return Values :  The pointer to the Subwindow.
 +--------------------------------------------------------------------------*/
 |
 |   Return Values :  The pointer to the Subwindow.
 +--------------------------------------------------------------------------*/

-NCURSES_EXPORT(WINDOW *)
+FORM_EXPORT(WINDOW *)

 form_sub(const FORM *form)
 {
   const FORM *f;
 
 form_sub(const FORM *form)
 {
   const FORM *f;
 

-  T((T_CALLED("form_sub(%p)"), form));
+  T((T_CALLED("form_sub(%p)"), (const void *)form));

 
   f = Normalize_Form(form);
   returnWin(Get_Form_Window(f));
 
   f = Normalize_Form(form);
   returnWin(Get_Form_Window(f));