diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2004-02-05 23:21:40 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2004-02-05 23:21:40 +0000 |
| commit | 58206f1160c8c29db7be15a67ee4aafac90450ef (patch) | |
| tree | 259d2ee5e097030d3d315f64b27fd42107152c66 /libjava | |
| parent | 0314451df319ee326f4df28f90e96cbdef790f5c (diff) | |
| download | gcc-58206f1160c8c29db7be15a67ee4aafac90450ef.zip gcc-58206f1160c8c29db7be15a67ee4aafac90450ef.tar.gz gcc-58206f1160c8c29db7be15a67ee4aafac90450ef.tar.bz2 | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 3 | ||||
| -rw-r--r-- | libjava/java/awt/Component.java | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 22fbd82..fd25156 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 f2fcef5..0b1e961 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); } /** |