Component.java (getFont): Return a default font instead of null.

2004-02-05  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* java/awt/Component.java (getFont): Return a default font
	instead of null.

From-SVN: r77352

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 22fbd8283876f63d7593928db06fd0362bc8149a..fd2515659a07e3aec9bb9bdc4feee2092af4d09c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-05  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
+       * java/awt/Component.java (getFont): Return a default font
+       instead of null.
+
        * java/awt/Scrollbar.java (next_scrollbar_number): New field.
        (Scrollbar (int, int, int, int, int)): Make default page
        increment 10.

diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java
index f2fcef59b1942ba8e8e03af2820c68ca36494008..0b1e9612b0478d1e2fe239df9530d6b7d124f83c 100644 (file)
--- a/libjava/java/awt/Component.java
+++ b/libjava/java/awt/Component.java
@@ -1001,7 +1001,11 @@ public abstract class Component
   {
     if (font != null)
       return font;
-    return parent == null ? null : parent.getFont();
+
+    if (parent != null)
+      return parent.getFont ();
+    else
+      return new Font ("Fixed", Font.PLAIN, 12);
   }
 
   /**