ncurses 5.9 - patch 20140816

[ncurses.git] / test / demo_forms.c

diff --git a/test/demo_forms.c b/test/demo_forms.c
index 1e6806d2e52392926b9ad6ded2cc11ee58933113..7ba067c13a78d979c1ccb541d5930e899cfab502 100644 (file)
--- a/test/demo_forms.c
+++ b/test/demo_forms.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2003-2012,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 2003-2013,2014 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_forms.c,v 1.46 2013/09/28 21:55:54 tom Exp $
+ * $Id: demo_forms.c,v 1.49 2014/08/02 23:11:57 tom Exp $
  *
  * Demonstrate a variety of functions from the form library.
  * Thomas Dickey - 2003/4/26
@@ -208,7 +208,7 @@ make_field(const char *label, int frow, int fcol, int rows, int cols)
        if (d_option) {
            if (has_colors()) {
                set_field_fore(f, (chtype) COLOR_PAIR(2));
-               set_field_back(f, A_UNDERLINE | COLOR_PAIR(3));
+               set_field_back(f, (A_UNDERLINE | (chtype) COLOR_PAIR(3)));
            } else {
                set_field_fore(f, A_BOLD);
            }
@@ -398,13 +398,13 @@ show_current_field(WINDOW *win, FORM * form)
        }
 
        waddch(win, ' ');
-       (void) wattrset(win, (int) field_fore(field));
+       (void) wattrset(win, AttrArg(field_fore(field), 0));
        waddstr(win, "fore");
        wattroff(win, (int) field_fore(field));
 
        waddch(win, '/');
 
-       (void) wattrset(win, (int) field_back(field));
+       (void) wattrset(win, AttrArg(field_back(field), 0));
        waddstr(win, "back");
        wattroff(win, (int) field_back(field));