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

svn path=/trunk/; revision=20171

diff --git a/ChangeLog b/ChangeLog
index 76345f194d34ce46787857ab392d4cc62f58cdd6..73cad6d4172cdea61cd469a9ab091ddcaf0b7c2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-05-26  Matthias Clasen  <mclasen@redhat.com>
+
+       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
+
 2008-05-26  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 513811 – Use cairo_format_stride_for_width()

diff --git a/INSTALL.in b/INSTALL.in
index a8c0be5c82bc07a5cc9a0e5d46a6b0c378594be0..e8b7b3ab2735115466a9620a5b6038459ebda18b 100644 (file)
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -5,7 +5,7 @@ GTK+ requires the following packages:
 
  - 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

diff --git a/configure.in b/configure.in
index f1f9c173f5122529f616e6768d9032000e72e74b..16eeb5614ee88ac7809e68fb1388da0cc6436f92 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -32,7 +32,7 @@ m4_define([gtk_binary_version], [2.10.0])
 
 # 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])
 

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index fefcabbffd9bfbe73b3060d04de37608060382a8..ee3357cd4274a3b1779c6be411242f0d098f9a50 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1539,8 +1539,7 @@ get_size (GtkCellRenderer *cell,
   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;