From 9160f9f1ae7d9f7501a3e6fb5113ba115fb8ccb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vivek=20Das=C2=A0Mohapatra?= <vivek@collabora.com>
Date: Fri, 12 Oct 2018 19:31:05 +0100
Subject: [PATCH 8/8] Manually wrap the menu bar in a viewport for GTK 3.8-

Versions of GTK prior to 3.8 cannot add non-scrollable
widgets to a scrolled window without a manually added viewport.
---
 src/gtkutil.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 3498d14fe1..cd8438f86a 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3547,7 +3547,11 @@ xg_update_frame_menubar (struct frame *f)
   gtk_scrolled_window_set_overlay_scrolling (sw, FALSE);
 #endif
 
+#if GTK_CHECK_VERSION (3, 8, 0)
   gtk_container_add (GTK_CONTAINER (sw), x->menubar_widget);
+#else
+  gtk_scrolled_window_add_with_viewport (sw, x->menubar_widget);
+#endif
 
   gtk_box_pack_start (GTK_BOX (x->vbox_widget), GTK_WIDGET(sw), FALSE, FALSE, 0);
   gtk_box_reorder_child (GTK_BOX (x->vbox_widget), GTK_WIDGET(sw), 0);
-- 
2.11.0