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 | b052fe0e2c428fa1168b45a8f425a15bf25d4706 (patch) | |
| tree | 36906b05a088916a0d31226893f33d2adba03392 | |
| parent | f05d81102c263b746c344a71cd3aafdec96d9f38 (diff) | |
| download | vim-git-b052fe0e2c428fa1168b45a8f425a15bf25d4706.tar.gz | |
updated for version 7.3.1245v7.3.1245
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 5ff619267..34d3dd4d9 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 9c646e600..c06fad352 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, |