ncurses 5.7 - patch 20110101

[ncurses.git] / ncurses / base / lib_bkgd.c

diff --git a/ncurses/base/lib_bkgd.c b/ncurses/base/lib_bkgd.c
index f790ee9df59b85578c739eadebb22433e017b4bf..d07d8111dbe61889cde192edf4c20c79f6958b53 100644 (file)
--- a/ncurses/base/lib_bkgd.c
+++ b/ncurses/base/lib_bkgd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2008,2009 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -36,7 +36,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_bkgd.c,v 1.38 2009/10/24 22:02:14 tom Exp $")
+MODULE_ID("$Id: lib_bkgd.c,v 1.42 2011/01/01 17:18:52 tom Exp $")

 
 /*
  * Set the window's background information.
 
 /*
  * Set the window's background information.


@@ -85,12 +85,12 @@ wbkgrndset(WINDOW *win, const ARG_CH_T ch)
            cchar_t wch;
            int tmp;
 
            cchar_t wch;
            int tmp;
 

-           wgetbkgrnd(win, &wch);
+           (void) wgetbkgrnd(win, &wch);

            tmp = _nc_to_char((wint_t) CharOf(wch));
 
            win->_bkgd = (((tmp == EOF) ? ' ' : (chtype) tmp)
                          | (AttrOf(wch) & ALL_BUT_COLOR)
            tmp = _nc_to_char((wint_t) CharOf(wch));
 
            win->_bkgd = (((tmp == EOF) ? ' ' : (chtype) tmp)
                          | (AttrOf(wch) & ALL_BUT_COLOR)

-                         | COLOR_PAIR(GET_WINDOW_PAIR(win)));
+                         | (chtype) ColorPair(GET_WINDOW_PAIR(win)));

        }
 #endif
     }
        }
 #endif
     }