diff options
author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-12-05 00:14:14 +0000 |
---|---|---|
committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-12-05 00:14:14 +0000 |
commit | f52cd482a21b1fef468473782764cf5e96ccd20e (patch) | |
tree | dc6c03d2304dd86e1aa6cbf4e389b9b9f0f979d8 | |
parent | f2337a5d84a0dddcfd8860d0ea1fd57988ca9ba3 (diff) | |
download | classpath-f52cd482a21b1fef468473782764cf5e96ccd20e.tar.gz |
2006-12-04 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java (getFontImpl): Return a default font if
topmost parent's font is null.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | java/awt/Component.java | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2006-12-04 Thomas Fitzsimmons <fitzsim@redhat.com> + + * java/awt/Component.java (getFontImpl): Return a default font if + topmost parent's font is null. + 2006-12-04 Mark Wielaard <mark@klomp.org> * javax/swing/text/html/CSS.java (parseMarginShorthand): diff --git a/java/awt/Component.java b/java/awt/Component.java index 380faf824..0bf64096c 100644 --- a/java/awt/Component.java +++ b/java/awt/Component.java @@ -1203,6 +1203,8 @@ public abstract class Component Component p = parent; if (p != null) f = p.getFontImpl(); + else + f = new Font("Dialog", Font.PLAIN, 12); } return f; } |