From 56bba8cf57d0aa75d0266486595efe0d070af0b7 Mon Sep 17 00:00:00 2001
From: Hans Boehm <Hans_Boehm@hp.com>
Date: Wed, 19 Feb 2003 00:35:35 +0000
Subject: XToolkit.java (getFontMetrics): initialize if necessary.

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.

From-SVN: r63077
---
 libjava/java/awt/TextField.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libjava/java/awt/TextField.java')

diff --git a/libjava/java/awt/TextField.java b/libjava/java/awt/TextField.java
index c2c2be7..13275e3 100644
--- a/libjava/java/awt/TextField.java
+++ b/libjava/java/awt/TextField.java
@@ -345,8 +345,9 @@ getPreferredSize(int columns)
 {
   TextFieldPeer tfp = (TextFieldPeer)getPeer();
   if (tfp == null)
-    return(null); // FIXME: What do we do if there is no peer?
-
+    {
+      return new Dimension(0, 0);
+    }
   return(tfp.getPreferredSize(columns));
 }
 
-- 
cgit v1.1