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

svn path=/trunk/; revision=21631

ChangeLog

+2008-10-11  Christian Dywan  <christian@imendio.com>
+
+	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
+
 2008-10-10  Behdad Esfahbod  <behdad@gnome.org>
 
 	Bug 551355 – [PATCH] Make glib build with libtool 2.2

gtk/gtkwidget.c

@@ -5096,7 +5096,7 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget)
        * 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;