X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_slkrefr.c;h=b06bf8d7f802af3bd1953de3ce2468cb742aff24;hp=81a01c9665b4a9d994dda984ec9eea5013967ed0;hb=bd75bb126bdbd8300fe73e8e8b2fe97bd07eef75;hpb=d4ede7c5fa6a269d338fea32cd93bf39083dda8c

diff --git a/ncurses/base/lib_slkrefr.c b/ncurses/base/lib_slkrefr.c
index 81a01c96..b06bf8d7 100644
--- a/ncurses/base/lib_slkrefr.c
+++ b/ncurses/base/lib_slkrefr.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            *
@@ -43,7 +43,13 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_slkrefr.c,v 1.21 2009/06/06 20:26:17 tom Exp $")
+MODULE_ID("$Id: lib_slkrefr.c,v 1.26 2010/05/01 19:17:28 tom Exp $")
+
+#ifdef USE_TERM_DRIVER
+#define NumLabels    InfoOf(SP_PARM).numlabels
+#else
+#define NumLabels    num_labels
+#endif
 
 /*
  * Paint the info line for the PC style SLK emulation.
@@ -56,7 +62,7 @@ slk_paint_info(WINDOW *win)
     if (win && sp && (sp->slk_format == 4)) {
 	int i;
 
-	mvwhline(win, 0, 0, 0, getmaxx(win));
+	(void) mvwhline(win, 0, 0, 0, getmaxx(win));
 	wmove(win, 0, 0);
 
 	for (i = 0; i < sp->_slk->maxlab; i++) {
@@ -81,7 +87,7 @@ slk_intern_refresh(SCREEN *sp)
 
     slk = sp->_slk;
     fmt = sp->slk_format;
-    numlab = InfoOf(sp).numlabels;
+    numlab = NumLabels;
 
     if (slk->hidden)
 	return;
@@ -103,13 +109,13 @@ slk_intern_refresh(SCREEN *sp)
 			slk_paint_info(slk->win);
 		    wmove(slk->win, SLK_LINES(fmt) - 1, slk->ent[i].ent_x);
 		    if (sp->_slk) {
-			wattrset(slk->win, AttrOf(sp->_slk->attr));
+			(void) wattrset(slk->win, AttrOf(sp->_slk->attr));
 		    }
 		    waddstr(slk->win, slk->ent[i].form_text);
 		    /* if we simulate SLK's, it's looking much more
 		       natural to use the current ATTRIBUTE also
 		       for the label window */
-		    wattrset(slk->win, WINDOW_ATTRS(StdScreen(sp)));
+		    (void) wattrset(slk->win, WINDOW_ATTRS(StdScreen(sp)));
 		}
 	    }
 	    slk->ent[i].dirty = FALSE;
@@ -138,7 +144,7 @@ slk_intern_refresh(SCREEN *sp)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_noutrefresh) (NCURSES_SP_DCL0)
 {
-    T((T_CALLED("slk_noutrefresh(%p)"), SP_PARM));
+    T((T_CALLED("slk_noutrefresh(%p)"), (void *) SP_PARM));
 
     if (SP_PARM == 0 || SP_PARM->_slk == 0)
 	returnCode(ERR);
@@ -163,7 +169,7 @@ slk_noutrefresh(void)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_refresh) (NCURSES_SP_DCL0)
 {
-    T((T_CALLED("slk_refresh(%p)"), SP_PARM));
+    T((T_CALLED("slk_refresh(%p)"), (void *) SP_PARM));
 
     if (SP_PARM == 0 || SP_PARM->_slk == 0)
 	returnCode(ERR);