2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7cfb8d4a4..a8216ec6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;
   }