diff options
author | Bram Moolenaar <Bram@vim.org> | 2004-06-30 16:16:41 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2004-06-30 16:16:41 +0000 |
commit | 843ee41eb8258ac50ed81976757d8b228382a880 (patch) | |
tree | d0fcdff9e19b05b182de1bb1be46b2e6f5b8b0b7 /src/menu.c | |
parent | f4b8e57ffd048f9ca46dd7618939ba7a1b2294ec (diff) | |
download | vim-git-843ee41eb8258ac50ed81976757d8b228382a880.tar.gz |
updated for version 7.0003
Diffstat (limited to 'src/menu.c')
-rw-r--r-- | src/menu.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/menu.c b/src/menu.c index 052910f7e..fc8411fbf 100644 --- a/src/menu.c +++ b/src/menu.c @@ -96,7 +96,7 @@ ex_menu(eap) char_u *arg; char_u *p; int i; -#if defined(FEAT_GUI) && !defined(FEAT_GUI_GTK) +#if defined(FEAT_GUI) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_KDE) int old_menu_height; # if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_W16) int old_toolbar_height; @@ -320,7 +320,7 @@ ex_menu(eap) EMSG(_(e_trailing)); goto theend; } -#if defined(FEAT_GUI) && !(defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON)) +#if defined(FEAT_GUI) && !(defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE) || defined(FEAT_GUI_PHOTON)) old_menu_height = gui.menu_height; # if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_W16) old_toolbar_height = gui.toolbar_height; @@ -437,7 +437,7 @@ ex_menu(eap) vim_free(map_buf); } -#if defined(FEAT_GUI) && !defined(FEAT_GUI_GTK) +#if defined(FEAT_GUI) && !(defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE)) /* If the menubar height changed, resize the window */ if (gui.in_use && (gui.menu_height != old_menu_height @@ -1843,7 +1843,7 @@ gui_update_menus(modes) } } -#if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) \ +#if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE) \ || defined(FEAT_GUI_PHOTON) || defined(PROTO) /* * Check if a key is used as a mnemonic for a toplevel menu. @@ -2174,6 +2174,7 @@ ex_emenu(eap) } #if defined(FEAT_GUI_MSWIN) \ + || (defined(FEAT_GUI_KDE) && defined(FEAT_MENU)) \ || (defined(FEAT_GUI_GTK) && defined(FEAT_MENU)) \ || defined(FEAT_BEVAL_TIP) || defined(PROTO) /* |