gtk+ r21233 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Aug 29 04:26:19 2008
New Revision: 21233
URL: http://svn.gnome.org/viewvc/gtk+?rev=21233&view=rev

Log:
2008-08-29  Matthias Clasen  <mclasen redhat com>

        Bug 549262 â GtkScrolledWindow should not accept focus unless
        GTK_CAN_FOCUS is set

        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_focus): only grab the
        focus, if GTK_WIDGET_CAN_FOCUS() returns TRUE. Patch by Sven
        Herzberg



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

Modified: trunk/gtk/gtkscrolledwindow.c
==============================================================================
--- trunk/gtk/gtkscrolledwindow.c	(original)
+++ trunk/gtk/gtkscrolledwindow.c	Fri Aug 29 04:26:19 2008
@@ -1547,7 +1547,7 @@
 	return TRUE;
     }
 
-  if (!had_focus_child)
+  if (!had_focus_child && GTK_WIDGET_CAN_FOCUS (widget))
     {
       gtk_widget_grab_focus (widget);
       return TRUE;