Fix GTK build with GLib <2.44

* src/gtkutil.c (struct _EmacsMenuBar, EmacsMenuBar): New
structs.
(emacs_menu_bar_get_type): New function declaration.

* src/gtkutil.c: Remove declaration of EmacsMenuBar class.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 72eb7ef2bb1ac08a1a7acdf8007a936d8b6a6b76..d4726014c019fa035b3a1c8fe7a568b1428368ea 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -78,11 +78,17 @@ typedef struct pgtk_output xp_output;
 
 #ifdef HAVE_GTK3
 static void emacs_menu_bar_get_preferred_width (GtkWidget *, gint *, gint *);
+static GType emacs_menu_bar_get_type (void);
 
-struct _EmacsMenuBar
+typedef struct _EmacsMenuBar
 {
   GtkMenuBar parent;
-};
+} EmacsMenuBar;
+
+typedef struct _EmacsMenuBarClass
+{
+  GtkMenuBarClass parent;
+} EmacsMenuBarClass;
 
 G_DEFINE_TYPE (EmacsMenuBar, emacs_menu_bar, GTK_TYPE_MENU_BAR)
 #endif

diff --git a/src/gtkutil.h b/src/gtkutil.h
index f850ecc4219d50d159b6b4ae533d06e9030061fb..b74244d84d04db51e9f7a01abfd3ffdf0dbb48cb 100644 (file)
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -83,10 +83,6 @@ 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,