gtk+ r20171 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon May 26 04:33:25 2008
New Revision: 20171
URL: http://svn.gnome.org/viewvc/gtk+?rev=20171&view=rev

Log:
        Bug 511163 â Remove pango_extents_to_pixels() calls

        * gtk/gtkcellrenderertext.c (get_size): Use
        pango_layout_get_pixel_extents.

        * configure.in: Bump Pango requirement to 1.20

        * INSTALL.in: Update required versions



Modified:
   trunk/ChangeLog
   trunk/INSTALL.in
   trunk/configure.in
   trunk/gtk/gtkcellrenderertext.c

Modified: trunk/INSTALL.in
==============================================================================
--- trunk/INSTALL.in	(original)
+++ trunk/INSTALL.in	Mon May 26 04:33:25 2008
@@ -5,7 +5,7 @@
 
  - The GLib, Pango, ATK and cairo libraries, available at the same 
    location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.15.0, 
-   Pango 1.19.3, ATK 1.13.0 and cairo 1.6.0.
+   Pango 1.20, ATK 1.13.0 and cairo 1.6.0.
 
  - The TIFF, PNG, and JPEG image loading libraries. You most
    likely have these installed on your system already. If not

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon May 26 04:33:25 2008
@@ -32,7 +32,7 @@
 
 # required versions of other packages
 m4_define([glib_required_version], [2.15.0])
-m4_define([pango_required_version], [1.19.3])
+m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.13.0])
 m4_define([cairo_required_version], [1.6])
 

Modified: trunk/gtk/gtkcellrenderertext.c
==============================================================================
--- trunk/gtk/gtkcellrenderertext.c	(original)
+++ trunk/gtk/gtkcellrenderertext.c	Mon May 26 04:33:25 2008
@@ -1539,8 +1539,7 @@
   else
     layout = get_layout (celltext, widget, FALSE, 0);
 
-  pango_layout_get_extents (layout, NULL, &rect);
-  pango_extents_to_pixels (&rect, NULL);
+  pango_layout_get_pixel_extents (layout, NULL, &rect);
 
   if (height)
     *height = cell->ypad * 2 + rect.height;