diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-05 23:21:40 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-05 23:21:40 +0000 |
| commit | 33326a8dadffea3bb84d507a65f58338c7054e7e (patch) | |
| tree | 259d2ee5e097030d3d315f64b27fd42107152c66 /libjava | |
| parent | 949aa2c669581698fe6fe931a6634c332988b7d3 (diff) | |
| download | ppe42-gcc-33326a8dadffea3bb84d507a65f58338c7054e7e.tar.gz ppe42-gcc-33326a8dadffea3bb84d507a65f58338c7054e7e.zip | |
2004-02-05 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java (getFont): Return a default font
instead of null.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77352 138bc75d-0d04-0410-961f-82ee72b054a4
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 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); } /** |
