diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-20 22:17:05 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-20 22:17:05 +0100 |
| commit | e89ff0472bc33779583d48e8d38a5e794d05613a (patch) | |
| tree | cbd3bdeaf7114fb086a895bc3bf83e6619ea3346 /src/menu.c | |
| parent | af7559f66603075e9b4d39d873b2161ea3ec8492 (diff) | |
| download | vim-e89ff0472bc33779583d48e8d38a5e794d05613a.zip | |
patch 7.4.1375
Problem: Still some Win16 code.
Solution: Remove FEAT_GUI_W16.(Hirohito Higashi)
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/menu.c b/src/menu.c index 4211f9123..b6f8ce47a 100644 --- a/src/menu.c +++ b/src/menu.c @@ -102,7 +102,7 @@ ex_menu( int i; #if defined(FEAT_GUI) && !defined(FEAT_GUI_GTK) int old_menu_height; -# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_W16) +# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) int old_toolbar_height; # endif #endif @@ -274,7 +274,7 @@ ex_menu( } #if defined(FEAT_GUI) && !(defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON)) old_menu_height = gui.menu_height; -# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_W16) +# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) old_toolbar_height = gui.toolbar_height; # endif #endif @@ -395,7 +395,7 @@ ex_menu( /* If the menubar height changed, resize the window */ if (gui.in_use && (gui.menu_height != old_menu_height -# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_W16) +# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) || gui.toolbar_height != old_toolbar_height # endif )) |