diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-09-18 20:06:48 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-09-18 20:06:48 +0000 |
| commit | a15d5c36f6e100ff512ca3fc2ff034d3cbd5f572 (patch) | |
| tree | 977167ee56376a78020bac27816be830a5c04e00 /gtk/gtkstyle.h | |
| parent | c45ee0bf85dd61abb6a8469265274c2265772af9 (diff) | |
| download | gtk+-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/gtkstyle.h')
| -rw-r--r-- | gtk/gtkstyle.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index 8c2a0c5b4c..a6de90197f 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -87,7 +87,6 @@ struct _GtkStyle GdkColor black; GdkColor white; - GdkFont *font; PangoFontDescription *font_desc; gint xthickness; @@ -112,6 +111,8 @@ struct _GtkStyle gint depth; GdkColormap *colormap; + GdkFont *private_font; + PangoFontDescription *private_font_desc; /* Font description for style->private_font or %NULL */ /* the RcStyle from which this style was created */ GtkRcStyle *rc_style; @@ -414,12 +415,20 @@ struct _GtkBorder GType gtk_style_get_type (void) G_GNUC_CONST; GtkStyle* gtk_style_new (void); -GtkStyle* gtk_style_copy (GtkStyle *style); -GtkStyle* gtk_style_attach (GtkStyle *style, - GdkWindow *window); +GtkStyle* gtk_style_copy (GtkStyle *style); +GtkStyle* gtk_style_attach (GtkStyle *style, + GdkWindow *window); void gtk_style_detach (GtkStyle *style); + +#ifndef GTK_DISABLE_DEPRECATED GtkStyle* gtk_style_ref (GtkStyle *style); void gtk_style_unref (GtkStyle *style); + +GdkFont * gtk_style_get_font (GtkStyle *style); +void gtk_style_set_font (GtkStyle *style, + GdkFont *font); +#endif /* GTK_DISABLE_DEPRECATED */ + void gtk_style_set_background (GtkStyle *style, GdkWindow *window, GtkStateType state_type); |