Mirror of the Vim source from https://github.com/vim/vim
Revision | f66abfa335bb76d20f2a375f148fb7705bfde287 (tree) |
---|---|
Time | 2006-11-29 01:16:58 |
Author | vimboss |
Commiter | vimboss |
updated for version 7.0-170
@@ -2405,8 +2405,7 @@ | ||
2405 | 2405 | tiw.mask = TCIF_TEXT; |
2406 | 2406 | tiw.iImage = -1; |
2407 | 2407 | tiw.pszText = wstr; |
2408 | - SendMessage(s_tabhwnd, TCM_INSERTITEMW, (WPARAM)nr, | |
2409 | - (LPARAM)&tiw); | |
2408 | + SendMessage(s_tabhwnd, TCM_SETITEMW, (WPARAM)nr, (LPARAM)&tiw); | |
2410 | 2409 | vim_free(wstr); |
2411 | 2410 | } |
2412 | 2411 | } |
@@ -3033,13 +3032,25 @@ | ||
3033 | 3032 | return OK; |
3034 | 3033 | } |
3035 | 3034 | |
3035 | +#ifndef WPF_RESTORETOMAXIMIZED | |
3036 | +# define WPF_RESTORETOMAXIMIZED 2 /* just in case someone doesn't have it */ | |
3037 | +#endif | |
3038 | + | |
3036 | 3039 | /* |
3037 | 3040 | * Return TRUE if the GUI window is maximized, filling the whole screen. |
3038 | 3041 | */ |
3039 | 3042 | int |
3040 | 3043 | gui_mch_maximized() |
3041 | 3044 | { |
3042 | - return IsZoomed(s_hwnd); | |
3045 | + WINDOWPLACEMENT wp; | |
3046 | + | |
3047 | + wp.length = sizeof(WINDOWPLACEMENT); | |
3048 | + if (GetWindowPlacement(s_hwnd, &wp)) | |
3049 | + return wp.showCmd == SW_SHOWMAXIMIZED | |
3050 | + || (wp.showCmd == SW_SHOWMINIMIZED | |
3051 | + && wp.flags == WPF_RESTORETOMAXIMIZED); | |
3052 | + | |
3053 | + return 0; | |
3043 | 3054 | } |
3044 | 3055 | |
3045 | 3056 | /* |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 170, | |
671 | +/**/ | |
670 | 672 | 169, |
671 | 673 | /**/ |
672 | 674 | 168, |