gtk+ r20281 - in branches/gtk-2-12: . gdk/x11

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Jun  2 21:59:46 2008
New Revision: 20281
URL: http://svn.gnome.org/viewvc/gtk+?rev=20281&view=rev

Log:
        Bug 526635 - _gdk_window_get_toplevel handles FOREIGN windows

        * gdk/x11/gdkwindow-x11.c (_gdk_window_get_toplevel): Check
        !WINDOW_IS_TOPLEVEL instead of checking for GDK_WINDOW_CHILD,
        so that we also take into account for foreign windows.
        Report and patch by Nathaniel Smith.



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

Modified: branches/gtk-2-12/gdk/x11/gdkwindow-x11.c
==============================================================================
--- branches/gtk-2-12/gdk/x11/gdkwindow-x11.c	(original)
+++ branches/gtk-2-12/gdk/x11/gdkwindow-x11.c	Mon Jun  2 21:59:46 2008
@@ -153,7 +153,7 @@
   
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
 
-  if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
+  if (!WINDOW_IS_TOPLEVEL (window));
     return NULL;
 
   private = (GdkWindowObject *)window;