← Back to branch summary

~ubuntu-branches/ubuntu/utopic/vim/utopic

« back to all changes in this revision

Viewing changes to src/gui_w32.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-01-13 18:39:18 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090113183918-kgq1jzdwsbbex4pq
Tags: 2:7.2.079-1ubuntu1
https://launchpad.net/bugs/296324
* Resynchronise with Debian (diversions fix closes LP: #296324). Remaining
  changes:
  - runtime/syntax/debcontrol.vim:
    + Add "metapackages" to the list of valid sections.
  - runtime/syntax/debchangelog.vim:
    + Add "jaunty" to the list of valid suites.
  - Drop vim-lesstif package and lesstif2-dev build-dependency.
  - Enable Python interpreter on basic builds.
  - Create a .pot file for translations.
  - Disable autoindent, line-wrapping, and backup files by default.
  - runtime/syntax/debsources.vim:
    + Add "jaunty" to debsourcesDistrKeyword
  - runtime/syntax/grub.vim:
    + Add Ubuntu-specific 'quiet' keyword.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui_w32.c
992
992
                            SendMessage(lpdi->hdr.hwndFrom, TTM_SETMAXTIPWIDTH,
993
993
                                                                      0, 500);
994
994
 
995
 
                            tt_text = enc_to_ucs2(str, NULL);
 
995
                            tt_text = enc_to_utf16(str, NULL);
996
996
                            lpdi->lpszText = tt_text;
997
997
                            /* can't show tooltip if failed */
998
998
                        }
1935
1935
    if (buf == NULL)
1936
1936
        return NULL;
1937
1937
 
1938
 
    convbuf = ucs2_to_enc(buf, lenp);
 
1938
    convbuf = utf16_to_enc(buf, lenp);
1939
1939
    pImmReleaseContext(hwnd, hIMC);
1940
1940
    vim_free(buf);
1941
1941
    return convbuf;
2566
2566
            {
2567
2567
                /* 'encoding' differs from active codepage: convert menu name
2568
2568
                 * and use wide function */
2569
 
                wn = enc_to_ucs2(menu->name, NULL);
 
2569
                wn = enc_to_utf16(menu->name, NULL);
2570
2570
                if (wn != NULL)
2571
2571
                {
2572
2572
                    MENUITEMINFOW       infow;
2728
2728
        {
2729
2729
            /* 'encoding' differs from active codepage: convert menu item name
2730
2730
             * and use wide function */
2731
 
            wn = enc_to_ucs2(menu->name, NULL);
 
2731
            wn = enc_to_utf16(menu->name, NULL);
2732
2732
            if (wn != NULL)
2733
2733
            {
2734
2734
                n = InsertMenuW(parent->submenu_id, (UINT)idx,
3570
3570
    if (enc_codepage == 0 && (int)GetACP() != enc_codepage)
3571
3571
    {
3572
3572
        /* Not a codepage, use our own conversion function. */
3573
 
        wn = enc_to_ucs2(lpAnsiIn, NULL);
 
3573
        wn = enc_to_utf16(lpAnsiIn, NULL);
3574
3574
        if (wn != NULL)
3575
3575
        {
3576
3576
            wcscpy(lpWCStr, wn);