Macro cleanup: FEAT_GUI_GTK

This commit is contained in:
Hettomei 2015-05-08 14:40:10 +02:00 committed by Justin M. Keyes
parent 5360324974
commit bd819aaed0
3 changed files with 2 additions and 14 deletions

View File

@ -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.

View File

@ -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

View File

@ -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))