gtk+ r21631 - in trunk: . gtk

[cdywan svn gnome org]

Author: cdywan
Date: Sat Oct 11 03:37:47 2008
New Revision: 21631
URL: http://svn.gnome.org/viewvc/gtk+?rev=21631&view=rev

Log:
Bug 555676 â gtk_widget_real_grab_focus assumes toplevel == window

* gtk/gtkwidget.c (gtk_widget_real_grab_focus):
Actually test for GTK_IS_WINDOW *and* GTK_WIDGET_TOPLEVEL

Modified:
   trunk/ChangeLog
   trunk/gtk/gtkwidget.c

Modified: trunk/gtk/gtkwidget.c
==============================================================================
--- trunk/gtk/gtkwidget.c	(original)
+++ trunk/gtk/gtkwidget.c	Sat Oct 11 03:37:47 2008
@@ -5096,7 +5096,7 @@
        * be set by the next loop.
        */
       toplevel = gtk_widget_get_toplevel (focus_widget);
-      if (GTK_IS_WINDOW (toplevel))
+      if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel))
 	{
 	  widget = GTK_WINDOW (toplevel)->focus_widget;