summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2007-11-14 10:09:44 +0000
committerMichael Natterer <mitch@src.gnome.org>2007-11-14 10:09:44 +0000
commit65ef21dfb3197cab8bd832b74a9551ce002dfccc (patch)
tree89dbef535a32a4d277bef4cc0ad7018d71f96f4e
parentb5f204ac3c578938e6f210f120b61dc41d417c34 (diff)
downloadgtk+-65ef21dfb3197cab8bd832b74a9551ce002dfccc.tar.gz
remove recently added gdk_flush() again, it's not needed after all.
2007-11-14 Michael Natterer <mitch@imendio.com> * gtk/gtkmenu.c (gtk_menu_popup): remove recently added gdk_flush() again, it's not needed after all. svn path=/trunk/; revision=18991
-rw-r--r--ChangeLog5
-rw-r--r--gtk/gtkmenu.c7
2 files changed, 5 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b8cc67923f..e766d4cdb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-11-14 Michael Natterer <mitch@imendio.com>
+ * gtk/gtkmenu.c (gtk_menu_popup): remove recently added
+ gdk_flush() again, it's not needed after all.
+
+2007-11-14 Michael Natterer <mitch@imendio.com>
+
* tests/testbbox.c
* tests/testframe.c: use g_object_ref/unref instead of deprecated
functions.
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 354ab21875..deb3a46c51 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1449,13 +1449,6 @@ gtk_menu_popup (GtkMenu *menu,
*/
gtk_widget_show (menu->toplevel);
- /* flush the X event queue for the popup to become realized and
- * mapped, since grabbing requires a mapped window. (this only works
- * for popups, regular windows need gtk_widget_show_now() to sync
- * with window manager interaction).
- */
- gdk_flush ();
-
if (xgrab_shell == widget)
popup_grab_on_window (widget->window, activate_time, grab_keyboard); /* Should always succeed */
gtk_grab_add (GTK_WIDGET (menu));