aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--widgets/e-text/e-text.c4
-rw-r--r--widgets/text/e-text.c4
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d673f7326..f89603e31c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 */