summaryrefslogtreecommitdiff
path: root/gtk/gtkfontsel.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-09-18 20:06:48 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-09-18 20:06:48 +0000
commita15d5c36f6e100ff512ca3fc2ff034d3cbd5f572 (patch)
tree977167ee56376a78020bac27816be830a5c04e00 /gtk/gtkfontsel.h
parentc45ee0bf85dd61abb6a8469265274c2265772af9 (diff)
downloadgtk+-a15d5c36f6e100ff512ca3fc2ff034d3cbd5f572.tar.gz
Fix up for changes to PangoFontDescription.
Wed Sep 12 11:21:14 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkcellrenderertext.[ch] gtk/gtktexttag.[ch] gtk/gtktextview.c tests/testgtk.c: Fix up for changes to PangoFontDescription. * gtk/gtkentry.c gtk/gtkclist.c gtk/gtkcellrenderertext.c gtk/gtkspinbutton.c: Fix up for change to PangoMetrics structure. * gtk/gtkfontsel.c: Fix up for new Pango font listing API. * gtk/gtkstyle.[ch]: Add gtk_style_get_font/set_font to replace direct access to style->font. Deprecate gtk_style_ref/unref. * gtk/gtkclist.c gtk/gtkctree.c gtk/gtkstyle.c gtk/gtkwidget.c: Remove gtk_style_ref/unref with g_object_ref/unref. * gtk/gtkcalendar.c: Remove leftover macros accessing style->font. * gtk/gtkhruler.c (gtk_hruler_draw_ticks): Remove unused variable. * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of style->font.
Diffstat (limited to 'gtk/gtkfontsel.h')
-rw-r--r--gtk/gtkfontsel.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index aa39d16372..5d8eb82142 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -78,7 +78,14 @@ struct _GtkFontSelection
GtkWidget *filter_button;
GtkWidget *preview_entry;
- PangoFontDescription *font_desc;
+ PangoFontFamily **families;
+ PangoFontFamily *family; /* Current family */
+
+ PangoFontFace **faces;
+ PangoFontFace *face; /* Current face */
+
+ gint size;
+
GdkFont *font; /* Cache for gdk_font_selection_get_font, so we can preserve
* refcounting behavior
*/