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

diff --git a/ncurses/base/lib_slkrefr.c b/ncurses/base/lib_slkrefr.c
index 81a01c96..01540f0f 100644
--- a/ncurses/base/lib_slkrefr.c
+++ b/ncurses/base/lib_slkrefr.c
@@ -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.24 2009/08/29 18:43:13 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.
@@ -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;