diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-07-02 21:32:56 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-07-02 21:32:56 +0000 |
| commit | bf87b7c6281f98b44f732c7c1c274129d83c5a7a (patch) | |
| tree | d595f39147e0ff2a6a7e1eb18b6170093942c547 /gtk/gtkfontsel.c | |
| parent | b02ebc65e4a0aa3d6b198d5491589f4ac3e60365 (diff) | |
| download | gtk+-bf87b7c6281f98b44f732c7c1c274129d83c5a7a.tar.gz | |
Use pango_layout_get_pixel_extents() to remove a large number of '/
Sun Jul 2 17:06:40 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalendar.c gtk/gtkclist.c gtk/gtkctree.c gtk/gtkhscale.c
gtk/gtkprogressbar.c gtk/gtkscale.c gtk/gtkvscale.c gtk/gtkaccellabel.c: Use
pango_layout_get_pixel_extents() to remove a large number of '/ PANGO_SCALE'.
* gtk/gtk[hv]ruler.c gtk/gtklabel.c: replace some / PANGO_SCALE with
PANGO_PIXELS() macro.
Diffstat (limited to 'gtk/gtkfontsel.c')
| -rw-r--r-- | gtk/gtkfontsel.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 34a9f95165..1698df6557 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -178,7 +178,6 @@ gtk_font_selection_init(GtkFontSelection *fontsel) GtkWidget *text_box; GtkWidget *table, *label; - fontsel->context = gtk_widget_create_pango_context (GTK_WIDGET (fontsel)); fontsel->font_desc = pango_font_description_from_string ("sans 12"); /* Create the table of font, style & size. */ @@ -348,7 +347,6 @@ gtk_font_selection_finalize (GObject *object) fontsel = GTK_FONT_SELECTION (object); - g_object_unref (G_OBJECT (fontsel->context)); pango_font_description_free (fontsel->font_desc); if (fontsel->font) @@ -449,7 +447,8 @@ gtk_font_selection_show_available_fonts (GtkFontSelection *fontsel) gchar **families; int n_families, i; - pango_context_list_families (fontsel->context, &families, &n_families); + pango_context_list_families (gtk_widget_get_pango_context (GTK_WIDGET (fontsel)), + &families, &n_families); qsort (families, n_families, sizeof(char *), cmp_strings); gtk_clist_freeze (GTK_CLIST (fontsel->font_clist)); @@ -562,7 +561,8 @@ gtk_font_selection_show_available_styles (GtkFontSelection *fontsel) gint match_row = 0; gchar *str; - pango_context_list_fonts (fontsel->context, fontsel->font_desc->family_name, &descs, &n_descs); + pango_context_list_fonts (gtk_widget_get_pango_context (GTK_WIDGET (fontsel)), + fontsel->font_desc->family_name, &descs, &n_descs); qsort (descs, n_descs, sizeof(PangoFontDescription *), font_description_sort_func); gtk_clist_freeze (GTK_CLIST (fontsel->font_style_clist)); @@ -833,7 +833,8 @@ gtk_font_selection_set_font_name (GtkFontSelection *fontsel, /* Check to make sure that this is in the list of allowed fonts */ - pango_context_list_fonts (fontsel->context, new_desc->family_name, &descs, &n_descs); + pango_context_list_fonts (gtk_widget_get_pango_context (GTK_WIDGET (fontsel)), + new_desc->family_name, &descs, &n_descs); for (i=0; i<n_descs; i++) { |