--- rxvt-unicode/src/init.C	2004/02/24 00:02:44	1.34
+++ rxvt-unicode/src/init.C	2004/02/24 21:46:14	1.37
@@ -1242,16 +1242,19 @@
   if (menuBar_height ())
     {
       menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
-                                        window_vt_x, 0,
-                                        TermWin_TotalWidth (),
-                                        menuBar_TotalHeight (),
-                                        0,
-                                        PixColors[Color_fg],
-                                        PixColors[Color_scroll]);
+                                         window_vt_x, 0,
+                                         TermWin_TotalWidth (),
+                                         menuBar_TotalHeight (),
+                                         0,
+                                         PixColors[Color_fg],
+                                         PixColors[Color_scroll]);
+
 #ifdef DEBUG_X
       XStoreName (display->display, menuBar.win, "menubar");
 #endif
 
+      menuBar.drawable = new rxvt_drawable (display, menuBar.win);
+
       XDefineCursor (display->display, menuBar.win,
                      XCreateFontCursor (display->display, XC_left_ptr));
 
@@ -1286,17 +1289,15 @@
                          GCForeground | GCBackground
                          | GCGraphicsExposures, &gcvalue);
 
+  TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
+
 #if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
   gcvalue.foreground = PixColors[Color_topShadow];
-  topShadowGC = XCreateGC (display->display, TermWin.vt,
-                          GCForeground, &gcvalue);
+  topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
   gcvalue.foreground = PixColors[Color_bottomShadow];
-  botShadowGC = XCreateGC (display->display, TermWin.vt,
-                          GCForeground, &gcvalue);
-  gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
-                                  : Color_scroll)];
-  scrollbarGC = XCreateGC (display->display, TermWin.vt,
-                          GCForeground, &gcvalue);
+  botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
+  gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
+  scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
 #endif
 }