diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-06-26 13:16:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-06-26 13:16:20 +0200 |
| commit | a927e306ee86fdc925145713e835c9a4f7341aa8 (patch) | |
| tree | a8c95b4efcb005c7984e8c18a1726fd346395201 | |
| parent | 1406620d8d69b26728c905d82ec8164b67a8fe9b (diff) | |
| download | vim-a927e306ee86fdc925145713e835c9a4f7341aa8.tar.gz | |
Problem: MS-Windows: confirm() dialog text may still not fit.
Solution: Use GetTextWidthEnc() instead of GetTextWidth() in two more
places. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/gui_w32.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 5ff61926..34d3dd4d 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -3282,7 +3282,7 @@ gui_mch_dialog( pend = vim_strchr(pstart, DLG_BUTTON_SEP); if (pend == NULL) pend = pstart + STRLEN(pstart); // Last button name. - textWidth = GetTextWidth(hdc, pstart, (int)(pend - pstart)); + textWidth = GetTextWidthEnc(hdc, pstart, (int)(pend - pstart)); if (textWidth < minButtonWidth) textWidth = minButtonWidth; textWidth += dlgPaddingX; /* Padding within button */ @@ -3307,7 +3307,7 @@ gui_mch_dialog( pend = vim_strchr(pstart, DLG_BUTTON_SEP); if (pend == NULL) pend = pstart + STRLEN(pstart); // Last button name. - textWidth = GetTextWidth(hdc, pstart, (int)(pend - pstart)); + textWidth = GetTextWidthEnc(hdc, pstart, (int)(pend - pstart)); textWidth += dlgPaddingX; /* Padding within button */ textWidth += DLG_VERT_PADDING_X * 2; /* Padding around button */ if (textWidth > dlgwidth) diff --git a/src/version.c b/src/version.c index 9c646e60..c06fad35 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1245, +/**/ 1244, /**/ 1243, |