From 2b8fb337a57a257e299f5f0c0824975a0f5f6272 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Sat, 17 Jun 2000 12:35:12 +0000 Subject: Made EText use the font from the canvas's style if one isn't set. 2000-06-17 Christopher James Lahey * 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 --- ChangeLog | 5 +++++ widgets/e-text/e-text.c | 4 ++++ widgets/text/e-text.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2d673f7326..f89603e31c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-06-17 Christopher James Lahey + + * 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 * 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 */ -- cgit v1.2.3