diff options
| author | Hettomei <itsumo.sibyllin@gmail.com> | 2015-05-08 14:40:10 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-07-17 21:40:39 -0400 |
| commit | bd819aaed0f72b43b553ba5b5e34df7fcb3f600c (patch) | |
| tree | cd6aa4acc8f0a83aede9aaad9846d8b9c9fd0d71 /src | |
| parent | 5360324974be724f8485aec39f75aeb06a58cb04 (diff) | |
| download | rneovim-bd819aaed0f72b43b553ba5b5e34df7fcb3f600c.tar.gz rneovim-bd819aaed0f72b43b553ba5b5e34df7fcb3f600c.tar.bz2 rneovim-bd819aaed0f72b43b553ba5b5e34df7fcb3f600c.zip | |
Macro cleanup: FEAT_GUI_GTK
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/menu.c | 11 | ||||
| -rw-r--r-- | src/nvim/normal.c | 2 | ||||
| -rw-r--r-- | src/nvim/vim.h | 3 |
3 files changed, 2 insertions, 14 deletions
diff --git a/src/nvim/menu.c b/src/nvim/menu.c index 03369f5635..41ecfd2890 100644 --- a/src/nvim/menu.c +++ b/src/nvim/menu.c @@ -460,11 +460,6 @@ add_menu_path ( menu->silent[i] = menuarg->silent[0]; } } -#if defined(FEAT_GUI_GTK) - /* Need to update the menu tip. */ - if (modes & MENU_TIP_MODE) - gui_mch_menu_set_tip(menu); -#endif } return OK; @@ -612,11 +607,6 @@ remove_menu ( menu->modes |= child->modes; if (modes & MENU_TIP_MODE) { free_menu_string(menu, MENU_INDEX_TIP); -#if defined(FEAT_GUI_GTK) - /* Need to update the menu tip. */ - if (gui.in_use) - gui_mch_menu_set_tip(menu); -#endif } if ((menu->modes & MENU_ALL_MODES) == 0) { /* The menu item is no longer valid in ANY mode, so delete it */ @@ -1331,7 +1321,6 @@ void ex_emenu(exarg_T *eap) } #if defined(FEAT_GUI_MSWIN) \ - || defined(FEAT_GUI_GTK) \ || defined(FEAT_BEVAL_TIP) /* * Given a menu descriptor, e.g. "File.New", find it in the menu hierarchy. diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 514fc5c68f..c69306ed47 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -2105,7 +2105,7 @@ do_mouse ( * NOTE: Ignore right button down and drag mouse events. * Windows only shows the popup menu on the button up event. */ -#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MAC) +#if defined(FEAT_GUI_MAC) if (!is_click) return false; #endif diff --git a/src/nvim/vim.h b/src/nvim/vim.h index e9606a7294..5e424f5375 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -338,8 +338,7 @@ enum { * functions of these names. The declarations would break if the defines had * been seen at that stage. But it must be before globals.h, where error_ga * is declared. */ -#if !defined(FEAT_GUI_X11) \ - && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC) +#if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_MAC) # define mch_errmsg(str) fprintf(stderr, "%s", (str)) # define display_errors() fflush(stderr) # define mch_msg(str) printf("%s", (str)) |