From 0cf1e1e106a9510f7cab96a650a57900119fe2d5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 26 Dec 2019 23:49:26 -0500 Subject: [PATCH] applicationwindow: Stop using a menu bar We have a replacement with popovers now. --- gtk/gtkapplicationwindow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index bd6a58de8c..63e31713cd 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -25,7 +25,7 @@ #include "gtkwidgetprivate.h" #include "gtkwindowprivate.h" #include "gtkheaderbar.h" -#include "gtkmenubar.h" +#include "gtkpopovermenubar.h" #include "gtkintl.h" #include "gtksettings.h" #include "gtkshortcutswindowprivate.h" @@ -70,7 +70,7 @@ * will display the application menu, but not the menubar. * * If the desktop environment does not display the menubar, then - * #GtkApplicationWindow will automatically show a #GtkMenuBar for it. + * #GtkApplicationWindow will automatically show a menubar for it. * This behaviour can be overridden with the #GtkApplicationWindow:show-menubar * property. If the desktop environment does not display the application * menu, then it will automatically be included in the menubar or in the @@ -273,7 +273,7 @@ gtk_application_window_update_menubar (GtkApplicationWindow *window) g_menu_append_section (combined, NULL, G_MENU_MODEL (priv->app_menu_section)); g_menu_append_section (combined, NULL, G_MENU_MODEL (priv->menubar_section)); - priv->menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (combined)); + priv->menubar = gtk_popover_menu_bar_new_from_model (G_MENU_MODEL (combined)); gtk_widget_set_parent (priv->menubar, GTK_WIDGET (window)); g_object_unref (combined); } -- 2.30.2