gtk+ r19571 - in branches/gtk-2-12: . gdk/quartz

[rhult svn gnome org]

Author: rhult
Date: Thu Feb 14 21:55:51 2008
New Revision: 19571
URL: http://svn.gnome.org/viewvc/gtk+?rev=19571&view=rev

Log:
2008-02-14  Richard Hult  <richard imendio com>

	Merged from trunk:

	* gdk/quartz/gdkwindow-quartz.c: (gdk_window_focus): Using
	makeKeyWindow unfortunately doesn't work in all cases, we must use
	makeKeyAndOrderFront.


Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gdk/quartz/gdkwindow-quartz.c

Modified: branches/gtk-2-12/gdk/quartz/gdkwindow-quartz.c
==============================================================================
--- branches/gtk-2-12/gdk/quartz/gdkwindow-quartz.c	(original)
+++ branches/gtk-2-12/gdk/quartz/gdkwindow-quartz.c	Thu Feb 14 21:55:51 2008
@@ -2218,7 +2218,7 @@
       if (private->accept_focus && private->window_type != GDK_WINDOW_TEMP) 
         {
           GDK_QUARTZ_ALLOC_POOL;
-          [impl->toplevel makeKeyWindow];
+          [impl->toplevel makeKeyAndOrderFront:impl->toplevel];
           GDK_QUARTZ_RELEASE_POOL;
         }
     }