--- rxvt-unicode/src/scrollbar-plain.C	2004/02/09 07:11:49	1.4
+++ rxvt-unicode/src/scrollbar-plain.C	2004/08/15 22:09:24	1.9
@@ -1,9 +1,10 @@
 /*----------------------------------------------------------------------*
- * File:	scrollbar-plain.c
+ * File:	scrollbar-plain.C
  *----------------------------------------------------------------------*
  *
  * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
  * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
+ * Copyright (c) 2004      Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,13 +23,12 @@
 
 #include "../config.h"		/* NECESSARY */
 #include "rxvt.h"		/* NECESSARY */
-#include "scrollbar-plain.intpro"	/* PROTOS for internal routines */
 
 /*----------------------------------------------------------------------*/
 #if defined(PLAIN_SCROLLBAR)
 
 int
-rxvt_term::scrollbar_show_plain (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len)
+rxvt_term::scrollbar_show_plain (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len)
 {
   int xsb = 0;
   int sbwidth = scrollBar.width - 1;
@@ -38,14 +38,14 @@
       XGCValues gcvalue;
 
       scrollBar.init |= R_SB_PLAIN;
-      gcvalue.foreground = PixColors[Color_fg];
-      gcvalue.background = PixColors[Color_bg];
+      gcvalue.foreground = pix_colors[Color_fg];
+      gcvalue.background = pix_colors[Color_bg];
 
       pscrollbarGC = XCreateGC (display->display, scrollBar.win,
                                 GCForeground | GCBackground, &gcvalue);
     }
   /* instead of XClearWindow (display->display, scrollBar.win); */
-  xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
+  xsb = (options & Opt_scrollBar_right) ? 1 : 0;
   if (last_top < scrollBar.top)
     XClearArea (display->display, scrollBar.win,
                 sb_shadow + xsb, last_top,