diff options
author | Owen Taylor <otaylor@redhat.com> | 2001-12-26 17:06:13 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2001-12-26 17:06:13 +0000 |
commit | e1033f5f5acbabd27b788910974b7b4f821bc33c (patch) | |
tree | 2b4b8b9001e15ef715ad101ddb927c7a02073b70 /ChangeLog.pre-2-4 | |
parent | 9ad1895548be8a8761219aeaac713f69d2fda4ae (diff) | |
download | gtk+-e1033f5f5acbabd27b788910974b7b4f821bc33c.tar.gz |
(#67542, reported by Anders Carlsson)
Wed Dec 26 11:49:01 2001 Owen Taylor <otaylor@redhat.com>
(#67542, reported by Anders Carlsson)
* gtk/gtkstyle.c (gtk_style_real_init_from_rc): Merge
rc_style->font_desc with defaul style instead of replacing
it.
* gtk/gtkrc.c (gtk_rc_style_real_merge): Allow partial
font descriptions in RC styles by calling
pango_font_description_merge().
Diffstat (limited to 'ChangeLog.pre-2-4')
-rw-r--r-- | ChangeLog.pre-2-4 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b77bbf5dcb..a0fb1c8be5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,15 @@ +Wed Dec 26 11:49:01 2001 Owen Taylor <otaylor@redhat.com> + + (#67542, reported by Anders Carlsson) + + * gtk/gtkstyle.c (gtk_style_real_init_from_rc): Merge + rc_style->font_desc with defaul style instead of replacing + it. + + * gtk/gtkrc.c (gtk_rc_style_real_merge): Allow partial + font descriptions in RC styles by calling + pango_font_description_merge(). + 2001-12-24 James Henstridge <james@daa.com.au> * gtk/gtkdialog.h (doc comment): s/<!>/<!-- -->/ to make the doc |