ncurses 5.6 - patch 20080412

[ncurses.git] / test / newdemo.c

diff --git a/test/newdemo.c b/test/newdemo.c
index 21a8f64f0bd17acda1e8a34e66855c9968665530..84d3f82cd06b13f31d109d18c1aae69c7e2f2310 100644 (file)
--- a/test/newdemo.c
+++ b/test/newdemo.c
@@ -2,19 +2,17 @@
  *  newdemo.c  -       A demo program using PDCurses. The program illustrate
  *                     the use of colours for text output.
  *
- * $Id: newdemo.c,v 1.27 2005/05/28 21:40:00 tom Exp $
+ * $Id: newdemo.c,v 1.30 2008/02/09 16:41:29 tom Exp $
  */
 
 #include <test.priv.h>
 
 #include <time.h>
 
-#define delay_output(x) napms(x)
-
 /*
  *  The Australian map
  */
-static const char *AusMap[16] =
+static CONST_MENUS char *AusMap[16] =
 {
     "           A           A ",
     "    N.T. AAAAA       AAAA ",
@@ -225,12 +223,13 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
     setlocale(LC_ALL, "");
 
+    CATCHALL(trap);
+
     initscr();
     if (has_colors())
        start_color();
     cbreak();
     curs_set(0);
-    signal(SIGINT, trap);
     width = 48;
     height = 14;               /* Create a drawing window */
     win = newwin(height, width, (LINES - height) / 2, (COLS - width) / 2);