From 7bd7a266f2fbdc92c1b513930e5adddf15dd152e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 9 Oct 2008 17:27:59 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20555676=20=E2=80=93=20gtk=5Fwidget=5Freal?= =?UTF-8?q?=5Fgrab=5Ffocus=20assumes=20toplevel=20=3D=3D=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gtk/gtkwidget.c (gtk_widget_real_grab_focus): Test for GTK_IS_WINDOW instead of GTK_WIDGET_TOPLEVEL svn path=/trunk/; revision=21622 --- ChangeLog | 7 +++++++ gtk/gtkwidget.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e68b197067..42e0109906 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-09 Christian Dywan + + Bug 555676 – gtk_widget_real_grab_focus assumes toplevel == window + + * gtk/gtkwidget.c (gtk_widget_real_grab_focus): + Test for GTK_IS_WINDOW instead of GTK_WIDGET_TOPLEVEL + 2008-10-09 Christian Dywan Bug 555573 – gtk_font_selection_set_font_name diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index b6b8d3da82..f5b2fd18cc 100644 --- a/gtk/gtkwidget.c +++ b/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_WIDGET_TOPLEVEL (toplevel)) + if (GTK_IS_WINDOW (toplevel)) { widget = GTK_WINDOW (toplevel)->focus_widget;