From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Thu, 5 Feb 2004 23:21:40 +0000 (+0000)
Subject: Component.java (getFont): Return a default font instead of null.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=58206f1160c8c29db7be15a67ee4aafac90450ef;p=gcc.git

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 22fbd828387..fd2515659a0 100644
--- 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 f2fcef59b19..0b1e9612b04 100644
--- 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);
   }
 
   /**