--- rxvt-unicode/src/scrollbar-next.C	2004/02/13 12:16:21	1.9
+++ rxvt-unicode/src/scrollbar-next.C	2004/08/15 21:55:45	1.13
@@ -1,11 +1,12 @@
 /*--------------------------------*-C-*---------------------------------*
- * File:	scrollbar-next.c
+ * File:	scrollbar-next.C
  *----------------------------------------------------------------------*
  *
  * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
  * Copyright (c) 1998      Alfredo K. Kojima <kojima@windowmaker.org>
  *				- N*XTstep like scrollbars
  * 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
@@ -24,7 +25,6 @@
 
 #include "../config.h"		/* NECESSARY */
 #include "rxvt.h"		/* NECESSARY */
-#include "scrollbar-next.intpro"	/* PROTOS for internal routines */
 
 /*----------------------------------------------------------------------*/
 #if defined(NEXT_SCROLLBAR)
@@ -123,7 +123,7 @@
   Pixmap          d;
   GC              pointcolour;
 
-  d = XCreatePixmap (display->display, scrollBar.win, width, height, XDEPTH);
+  d = XCreatePixmap (display->display, scrollBar.win, width, height, display->depth);
 
   for (y = 0; y < height; y++)
     {
@@ -153,11 +153,11 @@
 
   gcvalue.graphics_exposures = False;
 
-  gcvalue.foreground = PixColors[Color_Black];
+  gcvalue.foreground = pix_colors[Color_Black];
   blackGC = XCreateGC (display->display, scrollBar.win,
                       GCForeground | GCGraphicsExposures, &gcvalue);
 
-  gcvalue.foreground = PixColors[Color_White];
+  gcvalue.foreground = pix_colors[Color_White];
   whiteGC = XCreateGC (display->display, scrollBar.win,
                       GCForeground | GCGraphicsExposures, &gcvalue);
 
@@ -165,7 +165,7 @@
   xcol.green = 0xaaaa;
   xcol.blue = 0xaeba;
   //if (!rXAllocColor (&xcol, "light gray"))//TODO//D//
-  xcol.pixel = PixColors[Color_AntiqueWhite];
+  xcol.pixel = pix_colors[Color_AntiqueWhite];
   light = gcvalue.foreground = xcol.pixel;
   grayGC = XCreateGC (display->display, scrollBar.win,
                      GCForeground | GCGraphicsExposures, &gcvalue);
@@ -174,7 +174,7 @@
   xcol.green = 0x5555;
   xcol.blue = 0x5144;
   //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D//
-  xcol.pixel = PixColors[Color_Grey25];
+  xcol.pixel = pix_colors[Color_Grey25];
   dark = gcvalue.foreground = xcol.pixel;
   darkGC = XCreateGC (display->display, scrollBar.win,
                      GCForeground | GCGraphicsExposures, &gcvalue);
@@ -188,7 +188,7 @@
   gcvalue.fill_style = FillOpaqueStippled;
   gcvalue.stipple = stipple;
 
-  /*    XSetWindowBackground (display->display, scrollBar.win, PixColors[Color_Red]); */
+  /*    XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_Red]); */
 
   stippleGC = XCreateGC (display->display, scrollBar.win,
                         GCForeground | GCBackground | GCStipple