Mercurial > emacs
changeset 29320:33aa00975055
(single_submenu, w32_menu_show): Call ENCODE_SYSTEM on menu strings.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Tue, 30 May 2000 21:52:06 +0000 |
| parents | 2069f3aa4939 |
| children | 8e2be36bb1c6 |
| files | src/w32menu.c |
| diffstat | 1 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32menu.c Tue May 30 21:49:28 2000 +0000 +++ b/src/w32menu.c Tue May 30 21:52:06 2000 +0000 @@ -29,6 +29,8 @@ #include "keyboard.h" #include "blockinput.h" #include "buffer.h" +#include "charset.h" +#include "coding.h" /* This may include sys/types.h, and that somehow loses if this is not done before the other system files. */ @@ -69,8 +71,8 @@ char* value; /* keyboard equivalent. no implications for XtTranslations */ char* key; - /* Help string. */ - char* help; + /* Help string or null if none. */ + char *help; /* true if enabled */ Boolean enabled; /* true if selected */ @@ -1172,7 +1174,7 @@ prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; #ifndef HAVE_MULTILINGUAL_MENU if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name)) - pane_name = string_make_unibyte (pane_name); + pane_name = ENCODE_SYSTEM (pane_name); #endif pane_string = (NILP (pane_name) ? "" : (char *) XSTRING (pane_name)->data); @@ -1210,8 +1212,6 @@ Lisp_Object item_name, enable, descrip, def, type, selected; Lisp_Object help; - /* NTEMACS_TODO: implement popup/modeline help for menus. */ - item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME]; enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE]; descrip @@ -1223,9 +1223,9 @@ #ifndef HAVE_MULTILINGUAL_MENU if (STRING_MULTIBYTE (item_name)) - item_name = string_make_unibyte (item_name); + item_name = ENCODE_SYSTEM (item_name); if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) - descrip = string_make_unibyte (descrip); + descrip = ENCODE_SYSTEM (descrip); #endif wv = xmalloc_widget_value (); @@ -1619,7 +1619,7 @@ prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; #ifndef HAVE_MULTILINGUAL_MENU if (!NILP (pane_name) && STRING_MULTIBYTE (pane_name)) - pane_name = string_make_unibyte (pane_name); + pane_name = ENCODE_SYSTEM (pane_name); #endif pane_string = (NILP (pane_name) ? "" : (char *) XSTRING (pane_name)->data); @@ -1671,9 +1671,9 @@ #ifndef HAVE_MULTILINGUAL_MENU if (STRINGP (item_name) && STRING_MULTIBYTE (item_name)) - item_name = string_make_unibyte (item_name); + item_name = ENCODE_SYSTEM (item_name); if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) - descrip = string_make_unibyte (descrip); + descrip = ENCODE_SYSTEM (descrip); #endif wv = xmalloc_widget_value (); @@ -1725,7 +1725,7 @@ #ifndef HAVE_MULTILINGUAL_MENU if (STRING_MULTIBYTE (title)) - title = string_make_unibyte (title); + title = ENCODE_SYSTEM (title); #endif wv_title->name = (char *) XSTRING (title)->data; wv_title->enabled = True;