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

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Jun  6 21:00:40 2008
New Revision: 20326
URL: http://svn.gnome.org/viewvc/gtk+?rev=20326&view=rev

Log:
2008-06-06  Matthias Clasen  <mclasen redhat com>

        Bug 536757 â regression: openoffice.org menus are placed at wrong
        position since 2.12.10

        * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents):
        Return the right coordinates.


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	Fri Jun  6 21:00:40 2008
@@ -3412,6 +3412,7 @@
   Window xwindow;
   Window xparent;
   Window root;
+  Window child;
   Window *children;
   guchar *data;
   Window *vroots;
@@ -3470,13 +3471,15 @@
       if ((type_return == XA_CARDINAL) && (format_return == 32) &&
 	  (nitems_return == 4) && (data))
         {
-	  guint32 *ldata = (guint32 *) data;
+	  gulong *ldata = (gulong *) data;
 	  got_frame_extents = TRUE;
 
 	  /* try to get the real client window geometry */
 	  if (XGetGeometry (GDK_DISPLAY_XDISPLAY (display), xwindow,
-			    &root, &wx, &wy, &ww, &wh, &wb, &wd))
-	    {
+			    &root, &wx, &wy, &ww, &wh, &wb, &wd) &&
+              XTranslateCoordinates (GDK_DISPLAY_XDISPLAY (display),
+	  			     xwindow, root, 0, 0, &wx, &wy, &child))
+            {
 	      rect->x = wx;
 	      rect->y = wy;
 	      rect->width = ww;