--- rxvt-unicode/src/menubar.C	2004/03/03 04:07:52	1.12
+++ rxvt-unicode/src/menubar.C	2004/04/02 00:51:10	1.15
@@ -24,8 +24,7 @@
 
 #include "../config.h"		/* NECESSARY */
 
-#include <stdlib.h>
-#include <wchar.h>
+#include <cstdlib>
 
 #include "rxvt.h"		/* NECESSARY */
 #ifdef MENUBAR
@@ -1709,7 +1708,7 @@
             else if ((n = rxvt_Str_match (str, "pixmap:")) != 0)
               {
                 str += n;
-                xterm_seq (XTerm_Pixmap, str, CHAR_ST);
+                process_xterm_seq (XTerm_Pixmap, str, CHAR_ST);
               }
 #if (MENUBAR_MAX > 1)
             else if ((n = rxvt_Str_match (str, "rm")) != 0)
@@ -1762,7 +1761,7 @@
 
                 if ((fp = fopen (buffer, "wb")) != NULL)
                   {
-                    xterm_seq (XTerm_title, buffer, CHAR_ST);
+                    process_xterm_seq (XTerm_title, buffer, CHAR_ST);
                     menubar_dump (fp);
                     fclose (fp);
                   }
@@ -1849,7 +1848,7 @@
                 if (name == NULL || str == NULL || str <= (name + 1)
                     || (name > path && name[-1] != '/'))
                   {
-                    rxvt_print_error ("menu error <%s>\n", path);
+                    rxvt_warn ("menu error A<%s>, continuing.\n", path);
                     break;
                   }
                 if (str[1] == MENUITEM_BEG)
@@ -1859,7 +1858,7 @@
 
                     if (str == NULL)
                       {
-                        rxvt_print_error ("menu error <%s>\n", path);
+                        rxvt_warn ("menu error B<%s>, continuing.\n", path);
                         break;
                       }
                     name2[-2] = '\0';	/* remove prev MENUITEM_END */