diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-06-14 20:41:44 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-06-14 20:41:44 +0000 |
| commit | 22491fd6a4ee247bf49988db49250a6e3c278bf0 (patch) | |
| tree | 9048fa10acb725e3e08e526eba21f69998cd93b5 /gtk/gtkentry.c | |
| parent | 7d1a049bc39000840d2989f38e0ac444958d8740 (diff) | |
| download | gtk+-22491fd6a4ee247bf49988db49250a6e3c278bf0.tar.gz | |
Add missing gdk_rectangle_get_type() prototype.
Mon Jun 11 18:15:16 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.h: Add missing gdk_rectangle_get_type() prototype.
* gtk/gtk[hv]scale.c: Include math.h, stdlib.h
* gdk/gdkpango.h gtk/gtkclist.c gtk/gtkentry.c gtk/gtkmain.[ch]
gtk/gtkspinbutton.c gtk/gtkstyle.c gtk/gtktextbuffer.c
gtk/gtktextdisplay.c gtk/gtktextiter.[ch]
gtk/gtktextlayout.c gtk/gtktexttag.[ch] gtk/gtkwidget.c: Adapt
to recent changes in Pango.
* tests/testgtk.c: Set language tags with gtk_label_set_markup()
to test whether the basic engine honors them.
Diffstat (limited to 'gtk/gtkentry.c')
| -rw-r--r-- | gtk/gtkentry.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index c7544817f4..60234f85f3 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -1036,8 +1036,8 @@ gtk_entry_size_request (GtkWidget *widget, GtkEntry *entry; PangoFontMetrics metrics; PangoFont *font; - gchar *lang; gint xborder, yborder; + PangoContext *context; g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_ENTRY (widget)); @@ -1047,11 +1047,11 @@ gtk_entry_size_request (GtkWidget *widget, /* hackish for now, get metrics */ - font = pango_context_load_font (gtk_widget_get_pango_context (widget), - widget->style->font_desc); - lang = pango_context_get_lang (gtk_widget_get_pango_context (widget)); - pango_font_get_metrics (font, lang, &metrics); - g_free (lang); + context = gtk_widget_get_pango_context (widget); + font = pango_context_load_font (context, widget->style->font_desc); + pango_font_get_metrics (font, + pango_context_get_language (context), + &metrics); g_object_unref (G_OBJECT (font)); |