diff options
author | delphij <delphij@FreeBSD.org> | 2014-02-28 23:48:13 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2014-02-28 23:48:13 +0000 |
commit | 27526f9f8fb6184889d3cf86958ba2c9a17857ef (patch) | |
tree | ea0afb272a63d2a9f612979fa0b8095f0db61ec4 /contrib/ncurses/menu/m_global.c | |
parent | fff232b9197c57bd48d6cc22415ba15b1fed0b6d (diff) | |
parent | 1034bfc077f138b51edf6a5eadcb8ee507386460 (diff) | |
download | FreeBSD-src-27526f9f8fb6184889d3cf86958ba2c9a17857ef.zip FreeBSD-src-27526f9f8fb6184889d3cf86958ba2c9a17857ef.tar.gz |
MFV r262617: ncurses 5.9.
Diffstat (limited to 'contrib/ncurses/menu/m_global.c')
-rw-r--r-- | contrib/ncurses/menu/m_global.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/contrib/ncurses/menu/m_global.c b/contrib/ncurses/menu/m_global.c index 28e836d..90f6f25 100644 --- a/contrib/ncurses/menu/m_global.c +++ b/contrib/ncurses/menu/m_global.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2004,2005 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 * @@ -37,7 +37,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_global.c,v 1.23 2005/12/31 21:51:52 tom Exp $") +MODULE_ID("$Id: m_global.c,v 1.25 2010/01/23 21:20:10 tom Exp $") static char mark[] = "-"; /* *INDENT-OFF* */ @@ -253,7 +253,7 @@ _nc_Calculate_Text_Width(const TEXT * item /*FIXME: limit length */ ) #if USE_WIDEC_SUPPORT int result = item->length; - T((T_CALLED("_nc_menu_text_width(%p)"), item)); + T((T_CALLED("_nc_menu_text_width(%p)"), (const void *)item)); if (result != 0 && item->str != 0) { int count = mbstowcs(0, item->str, 0); @@ -496,7 +496,7 @@ _nc_Link_Items(MENU * menu) /*--------------------------------------------------------------------------- | Facility : libnmenu -| Function : void _nc_Show_Menu(const MENU *menu) +| Function : void _nc_Show_Menu(const MENU* menu) | | Description : Update the window that is associated with the menu | @@ -543,8 +543,10 @@ _nc_Show_Menu(const MENU * menu) | Return Values : - +--------------------------------------------------------------------------*/ NCURSES_EXPORT(void) - _nc_New_TopRow_and_CurrentItem - (MENU * menu, int new_toprow, ITEM * new_current_item) +_nc_New_TopRow_and_CurrentItem( + MENU * menu, + int new_toprow, + ITEM * new_current_item) { ITEM *cur_item; bool mterm_called = FALSE; |