summaryrefslogtreecommitdiff
path: root/src/gui_w32.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-11-20 16:10:17 +0000
committerBram Moolenaar <Bram@vim.org>2008-11-20 16:10:17 +0000
commit36f692dd8c95aa40a13a0e2ac12542cefdcef030 (patch)
tree225595eaf36e52c4f2815d1e4597c177f03c9094 /src/gui_w32.c
parent8df74be5870f47706d4a84e6499157ca13bf1938 (diff)
downloadvim-git-36f692dd8c95aa40a13a0e2ac12542cefdcef030.tar.gz
updated for version 7.2-049v7.2.049
Diffstat (limited to 'src/gui_w32.c')
-rw-r--r--src/gui_w32.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 9b77f7d69..a36f9766a 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -992,7 +992,7 @@ _WndProc(
SendMessage(lpdi->hdr.hwndFrom, TTM_SETMAXTIPWIDTH,
0, 500);
- tt_text = enc_to_ucs2(str, NULL);
+ tt_text = enc_to_utf16(str, NULL);
lpdi->lpszText = tt_text;
/* can't show tooltip if failed */
}
@@ -1935,7 +1935,7 @@ GetResultStr(HWND hwnd, int GCS, int *lenp)
if (buf == NULL)
return NULL;
- convbuf = ucs2_to_enc(buf, lenp);
+ convbuf = utf16_to_enc(buf, lenp);
pImmReleaseContext(hwnd, hIMC);
vim_free(buf);
return convbuf;
@@ -2566,7 +2566,7 @@ gui_mch_add_menu(
{
/* 'encoding' differs from active codepage: convert menu name
* and use wide function */
- wn = enc_to_ucs2(menu->name, NULL);
+ wn = enc_to_utf16(menu->name, NULL);
if (wn != NULL)
{
MENUITEMINFOW infow;
@@ -2728,7 +2728,7 @@ gui_mch_add_menu_item(
{
/* 'encoding' differs from active codepage: convert menu item name
* and use wide function */
- wn = enc_to_ucs2(menu->name, NULL);
+ wn = enc_to_utf16(menu->name, NULL);
if (wn != NULL)
{
n = InsertMenuW(parent->submenu_id, (UINT)idx,
@@ -3570,7 +3570,7 @@ nCopyAnsiToWideChar(
if (enc_codepage == 0 && (int)GetACP() != enc_codepage)
{
/* Not a codepage, use our own conversion function. */
- wn = enc_to_ucs2(lpAnsiIn, NULL);
+ wn = enc_to_utf16(lpAnsiIn, NULL);
if (wn != NULL)
{
wcscpy(lpWCStr, wn);