diff options
| author | Paul Eggert | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /src/w32menu.c | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.zip | |
Merge from trunk.
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 93194b68018..369b75877e8 100644 --- a/src/w32menu.c +++ b/src/w32menu.c | |||
| @@ -1219,7 +1219,7 @@ simple_dialog_show (FRAME_PTR f, Lisp_Object contents, Lisp_Object header) | |||
| 1219 | is_simple_dialog, we don't need to worry about checking contents | 1219 | is_simple_dialog, we don't need to worry about checking contents |
| 1220 | to see what type of dialog to use. */ | 1220 | to see what type of dialog to use. */ |
| 1221 | 1221 | ||
| 1222 | /* Use unicode if possible, so any language can be displayed. */ | 1222 | /* Use Unicode if possible, so any language can be displayed. */ |
| 1223 | if (unicode_message_box) | 1223 | if (unicode_message_box) |
| 1224 | { | 1224 | { |
| 1225 | WCHAR *text, *title; | 1225 | WCHAR *text, *title; |
| @@ -1476,7 +1476,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) | |||
| 1476 | utf16_string); | 1476 | utf16_string); |
| 1477 | if (!return_value) | 1477 | if (!return_value) |
| 1478 | { | 1478 | { |
| 1479 | /* On W9x/ME, unicode menus are not supported, though AppendMenuW | 1479 | /* On W9x/ME, Unicode menus are not supported, though AppendMenuW |
| 1480 | apparently does exist at least in some cases and appears to be | 1480 | apparently does exist at least in some cases and appears to be |
| 1481 | stubbed out to do nothing. out_string is UTF-8, but since | 1481 | stubbed out to do nothing. out_string is UTF-8, but since |
| 1482 | our standard menus are in English and this is only going to | 1482 | our standard menus are in English and this is only going to |
| @@ -1486,7 +1486,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) | |||
| 1486 | AppendMenu (menu, fuFlags, | 1486 | AppendMenu (menu, fuFlags, |
| 1487 | item != NULL ? (UINT) item: (UINT) wv->call_data, | 1487 | item != NULL ? (UINT) item: (UINT) wv->call_data, |
| 1488 | out_string); | 1488 | out_string); |
| 1489 | /* Don't use unicode menus in future. */ | 1489 | /* Don't use Unicode menus in future. */ |
| 1490 | unicode_append_menu = NULL; | 1490 | unicode_append_menu = NULL; |
| 1491 | } | 1491 | } |
| 1492 | 1492 | ||