gimp r25587 - in trunk: . app/display app/widgets

[neo svn gnome org]

Author: neo
Date: Thu May  8 12:34:27 2008
New Revision: 25587
URL: http://svn.gnome.org/viewvc/gimp?rev=25587&view=rev

Log:
2008-05-08  Sven Neumann  <sven gimp org>

	* app/display/gimpdisplayshell-callbacks.c
	(gimp_display_shell_events): move the focus to the canvas on
	button-press events.

	* app/widgets/gimpwindow.c (gimp_window_key_press_event): 
removed
	a use of G_UNLIKELY() that is somewhat bogus here.



Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell-callbacks.c
   trunk/app/widgets/gimpwindow.c

Modified: trunk/app/display/gimpdisplayshell-callbacks.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-callbacks.c	(original)
+++ trunk/app/display/gimpdisplayshell-callbacks.c	Thu May  8 12:34:27 2008
@@ -193,6 +193,9 @@
       }
 
     case GDK_BUTTON_PRESS:
+      gtk_widget_grab_focus (widget);
+      /* fall through */
+
     case GDK_SCROLL:
       set_display = TRUE;
       break;

Modified: trunk/app/widgets/gimpwindow.c
==============================================================================
--- trunk/app/widgets/gimpwindow.c	(original)
+++ trunk/app/widgets/gimpwindow.c	Thu May  8 12:34:27 2008
@@ -60,7 +60,7 @@
    */
 
   /* text widgets get all key events first */
-  if (G_UNLIKELY (GTK_IS_EDITABLE (focus) || GTK_IS_TEXT_VIEW (focus)))
+  if (GTK_IS_EDITABLE (focus) || GTK_IS_TEXT_VIEW (focus))
     handled = gtk_window_propagate_key_event (window, event);
 
   /* invoke control/alt accelerators */