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

[rhult svn gnome org]

Author: rhult
Date: Wed Feb 20 19:31:25 2008
New Revision: 19620
URL: http://svn.gnome.org/viewvc/gtk+?rev=19620&view=rev

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

	Merged from trunk:

	* gdk/quartz/gdkwindow-quartz.c: (show_window_internal),
	(_gdk_quartz_window_detach_from_parent),
	(_gdk_quartz_window_attach_to_parent), (gdk_window_focus): Clear
	the toplevel ordering list in all places where the order is
	potentially changed. Fixes mouse focus issues for windows with
	a transient parent set.


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	Wed Feb 20 19:31:25 2008
@@ -983,6 +983,7 @@
                   private->window_type != GDK_WINDOW_TEMP);
 
       [(GdkQuartzWindow*)impl->toplevel showAndMakeKey:make_key];
+      clear_toplevel_order ();
     }
   else
     {
@@ -1028,6 +1029,7 @@
 
       parent_impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (impl->transient_for)->impl);
       [parent_impl->toplevel removeChildWindow:impl->toplevel];
+      clear_toplevel_order ();
     }
 }
 
@@ -1049,6 +1051,7 @@
 
       parent_impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (impl->transient_for)->impl);
       [parent_impl->toplevel addChildWindow:impl->toplevel ordered:NSWindowAbove];
+      clear_toplevel_order ();
     }
 }
 
@@ -2219,6 +2222,7 @@
         {
           GDK_QUARTZ_ALLOC_POOL;
           [impl->toplevel makeKeyAndOrderFront:impl->toplevel];
+          clear_toplevel_order ();
           GDK_QUARTZ_RELEASE_POOL;
         }
     }