From ab3fb670213447443a53a34fd4e2cc6584f69287 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 5 Nov 2004 20:13:54 +0000 Subject: [PATCH] Don't unnecessarily call gtk_menu_position(), since that function has 2004-11-05 Matthias Clasen * gtk/gtkmenu.c (menu_change_screen): Don't unnecessarily call gtk_menu_position(), since that function has issues when called on a menu whose parent is unrealized. (#157354, Adam Hooper) --- gtk/gtkmenu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 4af7dc8eec..c62a755e41 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -956,6 +956,12 @@ menu_change_screen (GtkMenu *menu, { GtkMenuPrivate *private = gtk_menu_get_private (menu); + if (gtk_widget_has_screen (menu)) + { + if (new_screen == gtk_widget_get_screen (menu)) + return; + } + if (menu->torn_off) { gtk_window_set_screen (GTK_WINDOW (menu->tearoff_window), new_screen);