diff options
author | hboehm <hboehm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-19 00:35:35 +0000 |
---|---|---|
committer | hboehm <hboehm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-19 00:35:35 +0000 |
commit | 1bb9b6bd11c487703fe1b824ce79eefdafd392e1 (patch) | |
tree | abb4641e8aaeacc764f059098100e1aa5dde90a7 /libjava/java/awt/TextArea.java | |
parent | b0f897eae0353849120b2d5fb9f990f3e65bb9c6 (diff) | |
download | ppe42-gcc-1bb9b6bd11c487703fe1b824ce79eefdafd392e1.tar.gz ppe42-gcc-1bb9b6bd11c487703fe1b824ce79eefdafd392e1.zip |
2003-02-18 Hans Boehm <Hans.Boehm@hp.com>
* gnu/awt/xlib/XToolkit.java (getFontMetrics): initialize
if necessary.
* gnu/java/awt/peer/gtk/GtkButtonPeer.java,
gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
(setFont, gtkSetFont): add.
gnu/java/awt/peer/gtk/GtkComponentPeer.java (GtkComponentPeer):
Propagate font to peer. (setFont): add FIXME comment.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
(gtkTextGetSize): fix height, width computation.
* gnu/java/awt/peer/gtk/GtkFontPeer.java (GtkFontPeer):
Make X font name a bit less bogus.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
(post_adjustment_event): Pass on GTK_SCROLL_NONE.
* java/awt/Scrollbar.java (setValues): Fix visibleAmount range check.
(processAdjustmentEvent): Adjust value.
* java/awt/FlowLayout.java (layoutContainer) Fix 2 indexing and one
logic errors.
* java/awt/Component.java (setVisible, show, hide): Call show and
hide methods in subclasses.
(getPreferredSize): don't set prefSize before we have peer.
* java/awt/TextArea.java, java/awt/TextField.java (getPreferredSize):
Guess (0,0) if we don't have peer.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@63077 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/awt/TextArea.java')
-rw-r--r-- | libjava/java/awt/TextArea.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libjava/java/awt/TextArea.java b/libjava/java/awt/TextArea.java index f458f9b75e5..ec87f87d491 100644 --- a/libjava/java/awt/TextArea.java +++ b/libjava/java/awt/TextArea.java @@ -370,7 +370,11 @@ getPreferredSize(int rows, int columns) { TextAreaPeer tap = (TextAreaPeer)getPeer(); if (tap == null) - return(null); // FIXME: What do we do if there is no peer? + { + // Sun's JDK just seems to return Dimension(0,0) in this case. + // we do the same. + return new Dimension(0, 0); + } return(tap.getPreferredSize(rows, columns)); } |