X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=menu%2Fm_sub.c;h=82649c57b130bc35f630f3e2e0aed374db679814;hp=353c733cca6a4dcd3202eab738e6820161e3f3b5;hb=4e6cadb948fd73686614442733848fe271e5d7b2;hpb=661078ddbde3ce0f3b06e95642fbb9b5fef7dca1 diff --git a/menu/m_sub.c b/menu/m_sub.c index 353c733c..82649c57 100644 --- a/menu/m_sub.c +++ b/menu/m_sub.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998 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 * @@ -27,7 +27,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Juergen Pfeifer 1995,1997 * + * Author: Juergen Pfeifer, 1995,1997 * ****************************************************************************/ /*************************************************************************** @@ -37,7 +37,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_sub.c,v 1.2 1998/02/11 12:13:50 tom Exp $") +MODULE_ID("$Id: m_sub.c,v 1.10 2004/12/25 21:38:31 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -48,18 +48,21 @@ MODULE_ID("$Id: m_sub.c,v 1.2 1998/02/11 12:13:50 tom Exp $") | Return Values : E_OK - success | E_POSTED - menu is already posted +--------------------------------------------------------------------------*/ -int set_menu_sub(MENU *menu, WINDOW *win) +NCURSES_EXPORT(int) +set_menu_sub(MENU * menu, WINDOW *win) { + T((T_CALLED("set_menu_sub(%p,%p)"), menu, win)); + if (menu) { - if ( menu->status & _POSTED ) + if (menu->status & _POSTED) RETURN(E_POSTED); menu->usersub = win; _nc_Calculate_Item_Length_and_Width(menu); } else _nc_Default_Menu.usersub = win; - + RETURN(E_OK); } @@ -71,10 +74,13 @@ int set_menu_sub(MENU *menu, WINDOW *win) | | Return Values : NULL on error, otherwise a pointer to the window +--------------------------------------------------------------------------*/ -WINDOW *menu_sub(const MENU * menu) +NCURSES_EXPORT(WINDOW *) +menu_sub(const MENU * menu) { - const MENU* m = Normalize_Menu(menu); - return Get_Menu_Window(m); + const MENU *m = Normalize_Menu(menu); + + T((T_CALLED("menu_sub(%p)"), menu)); + returnWin(Get_Menu_Window(m)); } /* m_sub.c ends here */