diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gtk/gtkscrolledwindow.c | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -1,5 +1,14 @@ 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 + +2008-08-29 Matthias Clasen <mclasen@redhat.com> + * gtk/gtk.symbols: * gtk/gtkselection.[hc]: Split gtk_selection_data_get_data into gtk_selection_data_get_data and gtk_selection_data_get_length. diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 78f1110295..8134792a1f 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -1547,7 +1547,7 @@ gtk_scrolled_window_focus (GtkWidget *widget, return TRUE; } - if (!had_focus_child) + if (!had_focus_child && GTK_WIDGET_CAN_FOCUS (widget)) { gtk_widget_grab_focus (widget); return TRUE; |