Prevent GTK from setting unreasonable size hints with large menu bars

* src/gtkutil.c (struct _EmacsMenuBar): New struct.
(emacs_menu_bar_init):
(emacs_menu_bar_class_init):
(emacs_menu_bar_get_preferred_width):
(emacs_menu_bar_new): New functions.
(xg_update_menu_item): Use our own menu bar class on GTK 3.
* src/gtkutil.h (EmacsMenuBar): New class.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/gtkutil.h b/src/gtkutil.h
index b74244d84d0..f850ecc4219 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -83,6 +83,10 @@ typedef struct xg_menu_item_cb_data_
 
 } xg_menu_item_cb_data;
 
+#ifdef HAVE_GTK3
+G_DECLARE_FINAL_TYPE (EmacsMenuBar, emacs_menu_bar, EMACS, MENU_BAR, GtkMenuBar)
+#endif
+
 extern bool xg_uses_old_file_dialog (void);
 
 extern char *xg_get_file_name (struct frame *f,