--- rxvt-unicode/src/menubar.C	2004/04/02 00:51:10	1.15
+++ rxvt-unicode/src/menubar.C	2004/08/15 00:37:04	1.18
@@ -1,8 +1,9 @@
 /*--------------------------------*-C-*---------------------------------*
- * File:	menubar.c
+ * File:	menubar.C
  *----------------------------------------------------------------------*
  *
  * Copyright (c) 1997,1998  mj olesen <olesen@me.QueensU.CA>
+ * 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
@@ -30,7 +31,6 @@
 #ifdef MENUBAR
 #include "version.h"
 #include "menubar.h"
-#include "menubar.intpro"	/* PROTOS for internal routines */
 
 #define Menu_PixelWidth(menu)					\
     (2 * SHADOW + Width2Pixel ((menu)->width + 3 * HSPACE))
@@ -2036,7 +2036,7 @@
       /* Create the graphics context */
       XGCValues       gcvalue;
 
-      gcvalue.foreground = (XDEPTH <= 2 ? PixColors[Color_fg]
+      gcvalue.foreground = (display->depth <= 2 ? PixColors[Color_fg]
                             : PixColors[Color_Black]);
       menubarGC = XCreateGC (display->display, menuBar.win,
                             GCForeground, &gcvalue);