summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-30 13:26:14 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-30 13:26:14 +0200
commit0b6cf69c038b9af198542edc349ebe8e53a8f847 (patch)
treeccd58c40af4e16ef57ff52937efb70e24666385e
parent6be8c8e165204b8aa4eeb8a52be87a58d8b41b9e (diff)
downloadvim-git-0b6cf69c038b9af198542edc349ebe8e53a8f847.tar.gz
patch 7.4.1803v7.4.1803
Problem: GTK3 doesn't handle menu separaters properly. Solution: Use gtk_separator_menu_item_new(). (Kazunobu Kuriyama)
-rw-r--r--src/gui_gtk.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 55d10002a..81320ddc1 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -781,8 +781,12 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx)
if (menu_is_separator(menu->name))
{
/* Separator: Just add it */
+# if GTK_CHECK_VERSION(3,0,0)
+ menu->id = gtk_separator_menu_item_new();
+# else
menu->id = gtk_menu_item_new();
gtk_widget_set_sensitive(menu->id, FALSE);
+# endif
gtk_widget_show(menu->id);
# if GTK_CHECK_VERSION(3,0,0)
gtk_menu_shell_insert(GTK_MENU_SHELL(parent->submenu_id),
diff --git a/src/version.c b/src/version.c
index fc3164223..ff275cf0b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1803,
+/**/
1802,
/**/
1801,