[maemo-commits] [maemo-commits] r15864 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2008-08-11 17:36:25 +0300 (Mon, 11 Aug 2008)
New Revision: 15864

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkscrolledwindow.c
Log:
2008-08-11  Sven Herzberg  <sven at imendio.com>

	NB#87439: GtkScrolledWindow accepts focus even if not useful

	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_init),
	(gtk_scrolled_window_focus): don't set scrolled windows to accept
	focus; return FALSE from focus()



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-08-11 11:46:17 UTC (rev 15863)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-08-11 14:36:25 UTC (rev 15864)
@@ -1,3 +1,11 @@
+2008-08-11  Sven Herzberg  <sven at imendio.com>
+
+	NB#87439: GtkScrolledWindow accepts focus even if not useful
+
+	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_init),
+	(gtk_scrolled_window_focus): don't set scrolled windows to accept
+	focus; return FALSE from focus()
+
 2008-08-07 16:24:01  Tim Janik  <timj at imendio.com>
 
 	* gdk/x11/gdkmain-x11.c (gdk_x_error): abort the program with g_error()

Modified: projects/haf/trunk/gtk+/gtk/gtkscrolledwindow.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkscrolledwindow.c	2008-08-11 11:46:17 UTC (rev 15863)
+++ projects/haf/trunk/gtk+/gtk/gtkscrolledwindow.c	2008-08-11 14:36:25 UTC (rev 15864)
@@ -366,6 +366,9 @@
 gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window)
 {
   GTK_WIDGET_SET_FLAGS (scrolled_window, GTK_NO_WINDOW | GTK_CAN_FOCUS);
+#ifdef MAEMO_CHANGES
+  GTK_WIDGET_UNSET_FLAGS (scrolled_window, GTK_CAN_FOCUS);
+#endif
 
   scrolled_window->hscrollbar = NULL;
   scrolled_window->vscrollbar = NULL;
@@ -1558,6 +1561,10 @@
 
   if (!had_focus_child)
     {
+#ifdef MAEMO_CHANGES
+      if (!GTK_WIDGET_CAN_FOCUS (widget)
+        return FALSE;
+#endif
       gtk_widget_grab_focus (widget);
       return TRUE;
     }