--- rxvt-unicode/src/menubar.C	2004/08/15 04:54:21	1.19
+++ rxvt-unicode/src/menubar.C	2004/08/21 05:32:00	1.21
@@ -960,8 +960,8 @@
                                             x, ActiveMenu->y,
                                             ActiveMenu->w, ActiveMenu->h,
                                             0,
-                                            PixColors[Color_fg],
-                                            PixColors[Color_scroll]);
+                                            pix_colors[Color_fg],
+                                            pix_colors[Color_scroll]);
       ActiveMenu->drawable = new rxvt_drawable (display, ActiveMenu->win);
       XMapWindow (display->display, ActiveMenu->win);
     }
@@ -1037,14 +1037,14 @@
             name = NULL;
 
           if (len && name)
-            draw_string (*ActiveMenu->drawable, gc, TermWin.fontset,
+            draw_string (*ActiveMenu->drawable, gc, TermWin.fontset[0],
                          xoff, 2 * SHADOW + y, name, len);
 
           len = item->len2;
           name = item->name2;
 
           if (len && name)
-            draw_string (*ActiveMenu->drawable, gc, TermWin.fontset,
+            draw_string (*ActiveMenu->drawable, gc, TermWin.fontset[0],
                          ActiveMenu->w - (xoff + Width2Pixel (xright)), 2 * SHADOW + y, name, len);
 
           h = HEIGHT_TEXT + 2 * SHADOW;
@@ -2036,8 +2036,8 @@
       /* Create the graphics context */
       XGCValues       gcvalue;
 
-      gcvalue.foreground = (display->depth <= 2 ? PixColors[Color_fg]
-                            : PixColors[Color_Black]);
+      gcvalue.foreground = (display->depth <= 2 ? pix_colors[Color_fg]
+                            : pix_colors[Color_Black]);
       menubarGC = XCreateGC (display->display, menuBar.win,
                             GCForeground, &gcvalue);
 
@@ -2064,7 +2064,7 @@
             len = (TermWin.ncol - (menu->x + HSPACE));
 
           drawbox_menubar (menu->x, len, +1);
-          draw_string (*menuBar.drawable, menubarGC, TermWin.fontset,
+          draw_string (*menuBar.drawable, menubarGC, TermWin.fontset[0],
                        (Width2Pixel (menu->x) + Width2Pixel (HSPACE) / 2),
                        SHADOW, menu->name, len);
 
@@ -2127,7 +2127,7 @@
 
       ncol -= (x + len + HSPACE);
       if (len > 0 && ncol >= 0)
-        draw_string (*menuBar.drawable, menubarGC, TermWin.fontset,
+        draw_string (*menuBar.drawable, menubarGC, TermWin.fontset[0],
                      Width2Pixel (x) + Width2Pixel (ncol + HSPACE) / 2,
                      SHADOW, title, len);
     }