Index: emacs/src/w32menu.c
diff -c emacs/src/w32menu.c:1.76 emacs/src/w32menu.c:1.77
*** emacs/src/w32menu.c:1.76 Sun Aug 7 12:33:18 2005
--- emacs/src/w32menu.c Wed Aug 31 15:22:15 2005
***************
*** 2321,2327 ****
item != NULL ? (UINT) item
: (UINT) wv->call_data,
utf16_string);
! if (fuFlags & MF_OWNERDRAW)
local_free (out_string);
}
else
--- 2321,2343 ----
item != NULL ? (UINT) item
: (UINT) wv->call_data,
utf16_string);
! 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
_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-diffs
