diff options
author | Christopher James Lahey <clahey@helixcode.com> | 2000-06-17 20:35:12 +0800 |
---|---|---|
committer | Chris Lahey <clahey@src.gnome.org> | 2000-06-17 20:35:12 +0800 |
commit | 2b8fb337a57a257e299f5f0c0824975a0f5f6272 (patch) | |
tree | 51491988e4f3c30111e06b01f8faa9c231de98c3 | |
parent | 18dc66f5943935bdb5cbc1f52082aadea55a68ea (diff) | |
download | gsoc2013-evolution-2b8fb337a57a257e299f5f0c0824975a0f5f6272.tar gsoc2013-evolution-2b8fb337a57a257e299f5f0c0824975a0f5f6272.tar.gz gsoc2013-evolution-2b8fb337a57a257e299f5f0c0824975a0f5f6272.tar.bz2 gsoc2013-evolution-2b8fb337a57a257e299f5f0c0824975a0f5f6272.tar.lz gsoc2013-evolution-2b8fb337a57a257e299f5f0c0824975a0f5f6272.tar.xz gsoc2013-evolution-2b8fb337a57a257e299f5f0c0824975a0f5f6272.tar.zst gsoc2013-evolution-2b8fb337a57a257e299f5f0c0824975a0f5f6272.zip |
Made EText use the font from the canvas's style if one isn't set.
2000-06-17 Christopher James Lahey <clahey@helixcode.com>
* widgets/e-text/e-text.c: Made EText use the font from the
canvas's style if one isn't set.
svn path=/trunk/; revision=3607
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | widgets/e-text/e-text.c | 4 | ||||
-rw-r--r-- | widgets/text/e-text.c | 4 |
3 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2000-06-17 Christopher James Lahey <clahey@helixcode.com> + + * widgets/e-text/e-text.c: Made EText use the font from the + canvas's style if one isn't set. + 2000-06-17 Damon Chaplin <damon@helixcode.com> * widgets/meeting-time-sel/*: updated to use EText items rather than diff --git a/widgets/e-text/e-text.c b/widgets/e-text/e-text.c index 8e2f4451a6..330fa25e81 100644 --- a/widgets/e-text/e-text.c +++ b/widgets/e-text/e-text.c @@ -1474,6 +1474,10 @@ e_text_realize (GnomeCanvasItem *item) text->i_cursor = gdk_cursor_new (GDK_XTERM); text->default_cursor = gdk_cursor_new (GDK_LEFT_PTR); + if (text->font == NULL) { + text->font = GTK_WIDGET(item->canvas)->style->font; + gdk_font_ref(text->font); + } } /* Unrealize handler for the text item */ diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 8e2f4451a6..330fa25e81 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -1474,6 +1474,10 @@ e_text_realize (GnomeCanvasItem *item) text->i_cursor = gdk_cursor_new (GDK_XTERM); text->default_cursor = gdk_cursor_new (GDK_LEFT_PTR); + if (text->font == NULL) { + text->font = GTK_WIDGET(item->canvas)->style->font; + gdk_font_ref(text->font); + } } /* Unrealize handler for the text item */ |