ncurses 5.8 - patch 20110307
[ncurses.git] / ncurses / base / lib_winch.c
index 765220799a50689851b80164e658f10ad367cb3a..7e75f85bf390740bcced907b3633485faaf1400f 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************
- * Copyright (c) 1998,2000 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            *
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_winch.c,v 1.2 2000/07/29 16:41:44 tom Exp $")
+MODULE_ID("$Id: lib_winch.c,v 1.8 2010/12/19 01:22:58 tom Exp $")
 
 
-chtype
+NCURSES_EXPORT(chtype)
 winch(WINDOW *win)
 {
 winch(WINDOW *win)
 {
-    T((T_CALLED("winch(%p)"), win));
+    T((T_CALLED("winch(%p)"), (void *) win));
     if (win != 0) {
     if (win != 0) {
-       returnChar(win->_line[win->_cury].text[win->_curx]);
+       returnChtype((chtype) CharOf(win->_line[win->_cury].text[win->_curx])
+                    | AttrOf(win->_line[win->_cury].text[win->_curx]));
     } else {
     } else {
-       returnChar(0);
+       returnChtype(0);
     }
 }
     }
 }