Changeset 73603 in webkit

Timestamp:

Dec 9, 2010 3:18:48 AM (13 years ago)

Author:

kov@webkit.org

Message:

2010-12-09 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Build fix for GTK+3. Use functions added for GTK+ 2.24 to get the
GDK window size.

• plugins/gtk/gtk2xtbin.c: (gtk_xtbin_realize):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/gtk/gtk2xtbin.c (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-09  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Build fix for GTK+3. Use functions added for GTK+ 2.24 to get the
+        GDK window size.
+
+        * plugins/gtk/gtk2xtbin.c:
+        (gtk_xtbin_realize):
+
 2010-12-09  Siddharth Mathur  <siddharth.mathur@nokia.com>
 

trunk/WebCore/plugins/gtk/gtk2xtbin.c

@@ -275 +275 @@
   GtkAllocation widget_allocation;
 #endif
+
+#ifdef DEBUG_XTBIN
+  printf("gtk_xtbin_realize()\n");
+#endif
+
+  g_return_if_fail (GTK_IS_XTBIN (widget));
+
+  xtbin = GTK_XTBIN (widget);
+
+  /* caculate the allocation before realize */
+#if GTK_CHECK_VERSION(2, 24, 0)
+  allocation.width = gdk_window_get_width(xtbin->parent_window);
+  allocation.height = gdk_window_get_height(xtbin->parent_window);
+#else
   gint  x, y, w, h, d; /* geometry of window */
-
-#ifdef DEBUG_XTBIN
-  printf("gtk_xtbin_realize()\n");
-#endif
-
-  g_return_if_fail (GTK_IS_XTBIN (widget));
-
-  xtbin = GTK_XTBIN (widget);
-
-  /* caculate the allocation before realize */
   gdk_window_get_geometry(xtbin->parent_window, &x, &y, &w, &h, &d);
   allocation.width = w;
   allocation.height = h;
+#endif
   gtk_widget_size_allocate (widget, &allocation);