summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--INSTALL.in2
-rw-r--r--configure.in2
-rw-r--r--gtk/gtkcellrenderertext.c3
4 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 76345f194d..73cad6d417 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
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()
* gtk/gtkhsv.c (paint_ring, paint_triangle):
diff --git a/INSTALL.in b/INSTALL.in
index a8c0be5c82..e8b7b3ab27 100644
--- 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 f1f9c173f5..16eeb5614e 100644
--- 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 fefcabbffd..ee3357cd42 100644
--- 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;