diff options
Diffstat (limited to 'form/frm_win.c')
| -rw-r--r-- | form/frm_win.c | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/form/frm_win.c b/form/frm_win.c index a65cc59f843d..2258f0a6195b 100644 --- a/form/frm_win.c +++ b/form/frm_win.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2003,2004 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 * @@ -32,7 +32,7 @@ #include "form.priv.h" -MODULE_ID("$Id: frm_win.c,v 1.16 2010/01/23 21:14:36 tom Exp $") +MODULE_ID("$Id: frm_win.c,v 1.13 2004/12/11 22:15:27 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnform @@ -46,22 +46,13 @@ MODULE_ID("$Id: frm_win.c,v 1.16 2010/01/23 21:14:36 tom Exp $") NCURSES_EXPORT(int) set_form_win(FORM *form, WINDOW *win) { - T((T_CALLED("set_form_win(%p,%p)"), (void *)form, (void *)win)); + T((T_CALLED("set_form_win(%p,%p)"), form, win)); if (form && (form->status & _POSTED)) RETURN(E_POSTED); - else - { -#if NCURSES_SP_FUNCS - FORM *f = Normalize_Form(form); - f->win = win ? win : StdScreen(Get_Form_Screen(f)); - RETURN(E_OK); -#else - Normalize_Form(form)->win = win; - RETURN(E_OK); -#endif - } + Normalize_Form(form)->win = win; + RETURN(E_OK); } /*--------------------------------------------------------------------------- @@ -75,18 +66,12 @@ set_form_win(FORM *form, WINDOW *win) NCURSES_EXPORT(WINDOW *) form_win(const FORM *form) { - WINDOW *result; const FORM *f; - T((T_CALLED("form_win(%p)"), (const void *)form)); + T((T_CALLED("form_win(%p)"), form)); f = Normalize_Form(form); -#if NCURSES_SP_FUNCS - result = (f->win ? f->win : StdScreen(Get_Form_Screen(f))); -#else - result = (f->win ? f->win : stdscr); -#endif - returnWin(result); + returnWin(f->win ? f->win : stdscr); } /* frm_win.c ends here */ |