diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-11-28 16:16:58 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-11-28 16:16:58 +0000 |
| commit | 85f868c3ae5dafae004d41435fde01f529fea635 (patch) | |
| tree | 63d45e9f24825e057830e26452eec27f5ba0dca9 | |
| parent | b0c9a85bc836004a8fb50a1f321f267a1d0da3d7 (diff) | |
| download | vim-git-85f868c3ae5dafae004d41435fde01f529fea635.tar.gz | |
updated for version 7.0-170v7.0.170
| -rw-r--r-- | src/gui_w48.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/gui_w48.c b/src/gui_w48.c index 783fca769..353b7a6e3 100644 --- a/src/gui_w48.c +++ b/src/gui_w48.c @@ -2405,8 +2405,7 @@ gui_mch_update_tabline(void) tiw.mask = TCIF_TEXT; tiw.iImage = -1; tiw.pszText = wstr; - SendMessage(s_tabhwnd, TCM_INSERTITEMW, (WPARAM)nr, - (LPARAM)&tiw); + SendMessage(s_tabhwnd, TCM_SETITEMW, (WPARAM)nr, (LPARAM)&tiw); vim_free(wstr); } } @@ -3033,13 +3032,25 @@ gui_mch_init_font(char_u *font_name, int fontset) return OK; } +#ifndef WPF_RESTORETOMAXIMIZED +# define WPF_RESTORETOMAXIMIZED 2 /* just in case someone doesn't have it */ +#endif + /* * Return TRUE if the GUI window is maximized, filling the whole screen. */ int gui_mch_maximized() { - return IsZoomed(s_hwnd); + WINDOWPLACEMENT wp; + + wp.length = sizeof(WINDOWPLACEMENT); + if (GetWindowPlacement(s_hwnd, &wp)) + return wp.showCmd == SW_SHOWMAXIMIZED + || (wp.showCmd == SW_SHOWMINIMIZED + && wp.flags == WPF_RESTORETOMAXIMIZED); + + return 0; } /* diff --git a/src/version.c b/src/version.c index e88165416..d03ef121c 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 170, +/**/ 169, /**/ 168, |