Don't pass NULL to pango_context_get_metrics. Use

2005-01-09  Anders Carlsson <andersca@gnome.org>

	* gtk/gtkcellrenderertext.c: (get_size):
	* gtk/gtklabel.c: (gtk_label_size_request):
	* gtk/gtkprogressbar.c: (gtk_progress_bar_size_request):
	Don't pass NULL to pango_context_get_metrics. Use
	pango_context_get_language instead, which is way faster.

diff --git a/ChangeLog b/ChangeLog
index c755af56ecdc6493b54666cb1a4da320a96086cb..28e6eac39a771d328fc589723041c3d9fe899e6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-09  Anders Carlsson <andersca@gnome.org>
+
+       * gtk/gtkcellrenderertext.c: (get_size):
+       * gtk/gtklabel.c: (gtk_label_size_request):
+       * gtk/gtkprogressbar.c: (gtk_progress_bar_size_request):
+       Don't pass NULL to pango_context_get_metrics. Use 
+       pango_context_get_language instead, which is way faster.
+       
 2005-01-08  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c755af56ecdc6493b54666cb1a4da320a96086cb..28e6eac39a771d328fc589723041c3d9fe899e6a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-01-09  Anders Carlsson <andersca@gnome.org>
+
+       * gtk/gtkcellrenderertext.c: (get_size):
+       * gtk/gtklabel.c: (gtk_label_size_request):
+       * gtk/gtkprogressbar.c: (gtk_progress_bar_size_request):
+       Don't pass NULL to pango_context_get_metrics. Use 
+       pango_context_get_language instead, which is way faster.
+       
 2005-01-08  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c755af56ecdc6493b54666cb1a4da320a96086cb..28e6eac39a771d328fc589723041c3d9fe899e6a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2005-01-09  Anders Carlsson <andersca@gnome.org>
+
+       * gtk/gtkcellrenderertext.c: (get_size):
+       * gtk/gtklabel.c: (gtk_label_size_request):
+       * gtk/gtkprogressbar.c: (gtk_progress_bar_size_request):
+       Don't pass NULL to pango_context_get_metrics. Use 
+       pango_context_get_language instead, which is way faster.
+       
 2005-01-08  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c755af56ecdc6493b54666cb1a4da320a96086cb..28e6eac39a771d328fc589723041c3d9fe899e6a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2005-01-09  Anders Carlsson <andersca@gnome.org>
+
+       * gtk/gtkcellrenderertext.c: (get_size):
+       * gtk/gtklabel.c: (gtk_label_size_request):
+       * gtk/gtkprogressbar.c: (gtk_progress_bar_size_request):
+       Don't pass NULL to pango_context_get_metrics. Use 
+       pango_context_get_language instead, which is way faster.
+       
 2005-01-08  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index cada59ad2e9a248fd8b2983803e847b4062f3ab4..ca57fa3bed9016278352d062382edd5d7dd36ad7 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1436,7 +1436,7 @@ get_size (GtkCellRenderer *cell,
          gint char_width;
 
          context = pango_layout_get_context (layout);
-         metrics = pango_context_get_metrics (context, widget->style->font_desc, NULL);
+         metrics = pango_context_get_metrics (context, widget->style->font_desc, pango_context_get_language (context));
 
          char_width = pango_font_metrics_get_approximate_char_width (metrics);
          pango_font_metrics_unref (metrics);

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 7bd5329e74be491a48ff047bb66f27a64a9a2f68..aa5f9b93795458e06410ecda844a008050e8a14e 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2024,7 +2024,8 @@ gtk_label_size_request (GtkWidget      *widget,
       gint char_width, digit_width, char_pixels, w;
 
       context = pango_layout_get_context (label->layout);
-      metrics = pango_context_get_metrics (context, widget->style->font_desc, NULL);
+      metrics = pango_context_get_metrics (context, widget->style->font_desc, 
+                                          pango_context_get_language (context));
 
       char_width = pango_font_metrics_get_approximate_char_width (metrics);
       digit_width = pango_font_metrics_get_approximate_digit_width (metrics);

diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index fd241a074b0d67292fea4cea82067654e0d608d0..ac9f05201435a2f44e07d9e6ad907da9d5797149 100644 (file)
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -523,7 +523,7 @@ gtk_progress_bar_size_request (GtkWidget      *widget,
          
          /* The minimum size for ellipsized text is ~ 3 chars */
          context = pango_layout_get_context (layout);
-         metrics = pango_context_get_metrics (context, widget->style->font_desc, NULL);
+         metrics = pango_context_get_metrics (context, widget->style->font_desc, pango_context_get_language (context));
          
          char_width = pango_font_metrics_get_approximate_char_width (metrics);
          pango_font_metrics_unref (metrics);