Mercurial > emacs

changeset 65301:c0c0b5bf96ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(add_menu_item): If unicode_append_menu returns an error, revert to using AppendMenu.
author Jason Rumney <jasonr@gnu.org>
date Wed, 31 Aug 2005 15:22:15 +0000
parents 6a6c73b4d337
children c4e83cd72e41
files src/w32menu.c
diffstat 1 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/w32menu.c	Wed Aug 31 15:20:46 2005 +0000
+++ b/src/w32menu.c	Wed Aug 31 15:22:15 2005 +0000
@@ -2321,7 +2321,23 @@
 					  item != NULL ? (UINT) item
 					    : (UINT) wv->call_data,
 					  utf16_string);
-      if (fuFlags & MF_OWNERDRAW)
+      if (!return_value)
+	{
+	  /* On W9x/ME, unicode menus are not supported, though AppendMenuW
+	     apparently does exist at least in some cases and appears to be
+	     stubbed out to do nothing.  out_string is UTF-8, but since
+	     our standard menus are in English and this is only going to
+	     happen the first time a menu is used, the encoding is
+	     of minor importance compared with menus not working at all.  */
+	  return_value =
+	    AppendMenu (menu, fuFlags,
+			item != NULL ? (UINT) item: (UINT) wv->call_data,
+			out_string);
+	  /* Don't use unicode menus in future.  */
+	  unicode_append_menu = NULL;
+	}
+
+      if (unicode_append_menu && (fuFlags & MF_OWNERDRAW))
 	local_free (out_string);
     }
   else