X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdemo_menus.c;h=4625ef672fdbe78ed8d21b3cf704c17198771bfd;hp=4d553e2ea73c98947085f4a5fe02a0bab6057ecd;hb=b35ecb17e0406b48556609207aa52e9fee15cec6;hpb=48310f11b209169dcbcf4a25fab48d86af8c2017 diff --git a/test/demo_menus.c b/test/demo_menus.c index 4d553e2e..4625ef67 100644 --- a/test/demo_menus.c +++ b/test/demo_menus.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2005-2007,2008 Free Software Foundation, Inc. * + * Copyright (c) 2005-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 * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_menus.c,v 1.28 2008/08/23 20:31:54 tom Exp $ + * $Id: demo_menus.c,v 1.30 2010/05/01 19:12:26 tom Exp $ * * Demonstrate a variety of functions from the menu library. * Thomas Dickey - 2005/4/9 @@ -260,13 +260,13 @@ menu_destroy(MENU * m) { int count; - Trace(("menu_destroy %p", m)); + Trace(("menu_destroy %p", (void *) m)); if (m != 0) { ITEM **items = menu_items(m); const char *blob = 0; count = item_count(m); - Trace(("menu_destroy %p count %d", m, count)); + Trace(("menu_destroy %p count %d", (void *) m, count)); if ((count > 0) && (m == mpSelect)) { blob = item_name(*items); } @@ -368,7 +368,9 @@ build_select_menu(MenuNo number, char *filename) CONST_MENUS char **list = typeCalloc(CONST_MENUS char *, size + 1); items = typeCalloc(ITEM *, size + 1); - Trace(("build_select_menu blob=%p, items=%p", blob, items)); + Trace(("build_select_menu blob=%p, items=%p", + (void *) blob, + (void *) items)); if (blob != 0 && list != 0) { FILE *fp = fopen(filename, "r"); if (fp != 0) { @@ -544,7 +546,7 @@ perform_trace_menu(int cmd) trace(newtrace); Trace(("trace level interactively set to %s", tracetrace(_nc_tracing))); - (void) mvprintw(LINES - 2, 0, + MvPrintw(LINES - 2, 0, "Trace level is %s\n", tracetrace(_nc_tracing)); refresh(); }