Merge branch 'fix-deprecation-warning-in-menu' into 'gtk-3-24'

menu: Modernize code

See merge request GNOME/gtk!1048
This commit is contained in:
Emmanuele Bassi 2019-08-07 11:01:41 +00:00
commit 01d2ef6c66

View File

@ -1340,13 +1340,10 @@ gtk_menu_init (GtkMenu *menu)
menu->priv = priv;
priv->toplevel = g_object_connect (g_object_new (GTK_TYPE_WINDOW,
"type", GTK_WINDOW_POPUP,
"child", menu,
NULL),
"signal::event", gtk_menu_window_event, menu,
"signal::destroy", gtk_widget_destroyed, &priv->toplevel,
NULL);
priv->toplevel = gtk_window_new (GTK_WINDOW_POPUP);
gtk_container_add (GTK_CONTAINER (priv->toplevel), GTK_WIDGET (menu));
g_signal_connect (priv->toplevel, "event", G_CALLBACK (gtk_menu_window_event), menu);
g_signal_connect (priv->toplevel, "destroy", G_CALLBACK (gtk_widget_destroyed), &priv->toplevel);
gtk_window_set_resizable (GTK_WINDOW (priv->toplevel), FALSE);
gtk_window_set_mnemonic_modifier (GTK_WINDOW (priv->toplevel), 0);