--- rxvt-unicode/src/main.C	2004/02/22 10:38:11	1.42
+++ rxvt-unicode/src/main.C	2004/02/24 21:46:15	1.45
@@ -82,7 +82,7 @@
     scrollbar_ev (this, &rxvt_term::x_cb),
 #endif
 #ifdef MENUBAR
-    menubar_ev (this, &rxvt_term::x_cb), fixme
+    menubar_ev (this, &rxvt_term::x_cb),
 #endif
 #ifdef CURSOR_BLINK
     cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
@@ -119,8 +119,17 @@
   delete TermWin.fontset;
 
   if (display)
-    if (TermWin.parent[0])
-      XDestroyWindow (display->display, TermWin.parent[0]);
+    {
+#if defined(MENUBAR) && (MENUBAR_MAX > 1)
+      delete menuBar.drawable;
+      //if (menuBar.win)
+      //  XDestroyWindow (display->display, menuBar.win);
+#endif
+      delete TermWin.drawable;
+      // destroy all windows
+      if (TermWin.parent[0])
+        XDestroyWindow (display->display, TermWin.parent[0]);
+    }
 
   // TODO: free pixcolours, colours should become part of rxvt_display
 
@@ -251,7 +260,7 @@
 
   set_locale ("");
 
-#if (MENUBAR_MAX)
+#if MENUBAR_MAX
   menubar_read (rs[Rs_menu]);
 #endif
 #ifdef HAVE_SCROLLBARS
@@ -274,7 +283,7 @@
     resize_scrollbar ();      /* create and map scrollbar */
 #endif
 #if (MENUBAR_MAX)
-  if (menubar_visible (r))
+  if (menubar_visible ())
     XMapWindow (display->display, menuBar.win);
 #endif
 #ifdef TRANSPARENT