From 708062224a502c41561e122dcde5accf23f77ad9 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 22 Apr 2001 03:05:39 +0000
Subject: 	* Makefile.in: Rebuilt. 	* Makefile.am
 (awt_java_source_files): Added Line2D.java. 	* java/awt/geom/Line2D.java:
 Wrote.

	* java/awt/Menu.java (addNotify): Wrote.

	* java/awt/PopupMenu.java (addNotify): Implemented.
	(show): Likewise.

	* java/awt/Scrollbar.java (addNotify): Call super.addNotify.
	* java/awt/List.java (addNotify): Call super.addNotify.
	* java/awt/Label.java (addNotify): Call super.addNotify.
	* java/awt/FileDialog.java (addNotify): Call super.addNotify.
	* java/awt/Dialog.java (addNotify): Call super.addNotify.
	* java/awt/Choice.java (addNotify): Call super.addNotify.
	* java/awt/CheckboxMenuItem.java (addNotify): Call super.addNotify.
	* java/awt/Checkbox.java (addNotify): Call super.addNotify.

	* java/awt/List.java (replaceItem): Notify peer.

	* java/awt/geom/Rectangle2D.java
	(Float.setRect(float,float,float,float)): New method.

	* java/awt/event/ContainerEvent.java (getContainer): Now returns
	Container.

	* java/awt/RenderingHints.java (Key): Class now public.

	* java/awt/Rectangle.java (Rectangle): Now implements
	Serializable.
	(getPathIterator): Removed.

	* java/awt/GraphicsConfiguration.java (GraphicsConfiguration): New
	constructor.

	* java/awt/FileDialog.java: Wrote.

	* java/awt/EventQueue.java (isDispatchThread): Now public.
	(invokeLater): Likewise.

	* java/awt/Component.java (setCursor): Update peer.
	(getFontMetrics): Use peer.

	* java/awt/ComponentOrientation.java (ComponentOrientation): Class
	now final.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41489 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/java/awt/Component.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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

diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java
index 6bca20d4c32..0feb69451aa 100644
--- a/libjava/java/awt/Component.java
+++ b/libjava/java/awt/Component.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -649,14 +649,18 @@ public abstract class Component implements ImageObserver, MenuContainer,
   
   public FontMetrics getFontMetrics(Font font)
   {
-    return getToolkit().getFontMetrics(font);
+    if (peer == null)
+      return getToolkit().getFontMetrics(font);
+    return peer.getFontMetrics (font);
   }
-  
+
   public void setCursor(Cursor cursor)
   {
     this.cursor = cursor;
+    if (peer != null)
+      peer.setCursor (cursor);
   }
-  
+
   public Cursor getCursor()
   {
     return this.cursor;
@@ -705,7 +709,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
 	  parent.repaint(tm, x+getX(), y+getY(), width, height);
 	return;
       }
-    
+
     if (peer != null)
       peer.repaint(tm, x, y, width, height);
   }
-- 
cgit v1.2.3