Imported Classpath 0.18.

	* sources.am, Makefile.in: Updated.
	* Makefile.am (nat_source_files): Removed natProxy.cc.
	* java/lang/reflect/natProxy.cc: Removed.
	* gnu/classpath/jdwp/VMFrame.java,
	gnu/classpath/jdwp/VMIdManager.java,
	gnu/classpath/jdwp/VMVirtualMachine.java,
	java/lang/reflect/VMProxy.java: New files.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC
	list.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/net/DefaultContentHandlerFactory.java (getContent):
	Remove ClasspathToolkit references.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/awt/xlib/XCanvasPeer.java: Add new peer methods.
	* gnu/awt/xlib/XFramePeer.java: Likewise.
	* gnu/awt/xlib/XGraphicsConfiguration.java: Likewise.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c.  Add
	classpath/native/jawt/jawt.c.
	* Makefile.in: Regenerate.
	* jawt.c: Remove file.
	* include/Makefile.am (tool_include__HEADERS): Remove jawt.h and
	jawt_md.h.  Add ../classpath/include/jawt.h and
	../classpath/include/jawt_md.h.
	* include/Makefile.in: Regenerate.
	* include/jawt.h: Regenerate.
	* include/jawt_md.h: Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104586 138bc75d-0d04-0410-961f-82ee72b054a4

8 files changed, 126 insertions, 1 deletions

diff --git a/libjava/classpath/java/awt/peer/ComponentPeer.java b/libjava/classpath/java/awt/peer/ComponentPeer.java
index 7ed8f6051db..1ba16923224 100644
--- a/libjava/classpath/java/awt/peer/ComponentPeer.java
+++ b/libjava/classpath/java/awt/peer/ComponentPeer.java
@@ -51,6 +51,7 @@ import java.awt.Graphics;
 import java.awt.GraphicsConfiguration;
 import java.awt.Image;
 import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.Toolkit;
 import java.awt.event.PaintEvent;
 import java.awt.image.ColorModel;
@@ -184,4 +185,48 @@ public interface ComponentPeer
    * @since 1.2
    */
   void destroyBuffers();
+  
+  /**
+   * Get the bounds of this component peer.
+   * 
+   * @return component peer bounds
+   * @since 1.5
+   */
+  Rectangle getBounds();
+
+  /**
+   * Reparent this component under another container.
+   * 
+   * @param parent
+   * @since 1.5
+   */
+  void reparent(ContainerPeer parent);
+  
+  /**
+   * Set the bounds of this component peer.
+   * 
+   * @param x the new x co-ordinate
+   * @param y the new y co-ordinate
+   * @param width the new width
+   * @param height the new height
+   * @param z the new stacking level
+   * @since 1.5
+   */
+  void setBounds (int x, int y, int width, int height, int z);
+  
+  /**
+   * Check if this component supports being reparented.
+   * 
+   * @return true if this component can be reparented,
+   * false otherwise.
+   * @since 1.5
+   */
+  boolean isReparentSupported();
+
+  /**
+   * Layout this component peer.
+   *
+   * @since 1.5
+   */
+  void layout();
 }
diff --git a/libjava/classpath/java/awt/peer/ContainerPeer.java b/libjava/classpath/java/awt/peer/ContainerPeer.java
index f1373a16472..76673a1dfec 100644
--- a/libjava/classpath/java/awt/peer/ContainerPeer.java
+++ b/libjava/classpath/java/awt/peer/ContainerPeer.java
@@ -54,6 +54,31 @@ public interface ContainerPeer extends ComponentPeer
   void endLayout();
 
   boolean isPaintPending();
-
+  
+  /**
+   * Check if this container peer can be restacked.
+   * 
+   * @return true if this container peer supports being restacked, false otherwise
+   * @since 1.5
+   */
+  boolean isRestackSupported();
+
+  /**
+   * Cancel a pending paint event on a region of this container.
+   * 
+   * @param x the x co-ordinate of the region
+   * @param y the y co-ordinate of the region
+   * @param width the width of the region
+   * @param height the height of the region
+   * @since 1.5
+   */
+  void cancelPendingPaint(int x, int y, int width, int height);
+  
+  /**
+   * Restack the component peers in this container peer.
+   * 
+   * @since 1.5
+   */
+  void restack();
 } // interface ContainerPeer 
 
diff --git a/libjava/classpath/java/awt/peer/FramePeer.java b/libjava/classpath/java/awt/peer/FramePeer.java
index 13498ff2f67..13435f8e4c5 100644
--- a/libjava/classpath/java/awt/peer/FramePeer.java
+++ b/libjava/classpath/java/awt/peer/FramePeer.java
@@ -51,5 +51,25 @@ public interface FramePeer extends WindowPeer
   int getState();
   void setState(int state);
   void setMaximizedBounds(Rectangle r);
+  
+  /**
+   * Check if this frame peer supports being restacked.
+   * 
+   * @return true if this frame peer can be restacked,
+   * false otherwise
+   * @since 1.5
+   */
+  boolean isRestackSupported();
+  
+  /**
+   * Sets the bounds of this frame peer.
+   * 
+   * @param x the new x co-ordinate
+   * @param y the new y co-ordinate
+   * @param width the new width
+   * @param height the new height
+   * @since 1.5
+   */
+  void setBoundsPrivate(int x, int y, int width, int height);
 } // interface FramePeer
 
diff --git a/libjava/classpath/java/awt/peer/MenuBarPeer.java b/libjava/classpath/java/awt/peer/MenuBarPeer.java
index c5f7c581ff5..44e37e2d43b 100644
--- a/libjava/classpath/java/awt/peer/MenuBarPeer.java
+++ b/libjava/classpath/java/awt/peer/MenuBarPeer.java
@@ -42,6 +42,7 @@ import java.awt.Menu;
 
 public interface MenuBarPeer extends MenuComponentPeer
 {
+  void addMenu(Menu m);
   void addHelpMenu(Menu menu);
   void delMenu(int index);
 } // interface MenuBarPeer 
diff --git a/libjava/classpath/java/awt/peer/MenuComponentPeer.java b/libjava/classpath/java/awt/peer/MenuComponentPeer.java
index 1b10ca1f4c7..bfd3414ece0 100644
--- a/libjava/classpath/java/awt/peer/MenuComponentPeer.java
+++ b/libjava/classpath/java/awt/peer/MenuComponentPeer.java
@@ -38,8 +38,18 @@ exception statement from your version. */
 
 package java.awt.peer;
 
+import java.awt.Font;
+
 public interface MenuComponentPeer
 {
   void dispose();
+  
+  /**
+   * Set the font on this menu component peer.
+   * 
+   * @param font the new font
+   * @since 1.5
+   */
+  void setFont (Font font);
 } // interface MenuComponentPeer
 
diff --git a/libjava/classpath/java/awt/peer/MenuPeer.java b/libjava/classpath/java/awt/peer/MenuPeer.java
index c51ea73bb6c..91d0f0d1176 100644
--- a/libjava/classpath/java/awt/peer/MenuPeer.java
+++ b/libjava/classpath/java/awt/peer/MenuPeer.java
@@ -43,6 +43,7 @@ import java.awt.MenuItem;
 public interface MenuPeer extends MenuItemPeer
 {
   void addItem (MenuItem item);
+  void addSeparator ();
   void delItem (int index);
 }
 
diff --git a/libjava/classpath/java/awt/peer/TextComponentPeer.java b/libjava/classpath/java/awt/peer/TextComponentPeer.java
index cacc7d8de4e..f8072997462 100644
--- a/libjava/classpath/java/awt/peer/TextComponentPeer.java
+++ b/libjava/classpath/java/awt/peer/TextComponentPeer.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package java.awt.peer;
 
 import java.awt.Rectangle;
+import java.awt.im.InputMethodRequests;
 
 public interface TextComponentPeer extends ComponentPeer
 {
@@ -53,5 +54,13 @@ public interface TextComponentPeer extends ComponentPeer
   int getIndexAtPoint(int x, int y);
   Rectangle getCharacterBounds(int pos);
   long filterEvents(long filter);
+  
+  /**
+   * Retrieve this text component peer's input method requests.
+   * 
+   * @return the input method requests made by this text component peer
+   * @since 1.5
+   */
+  InputMethodRequests getInputMethodRequests();
 } // interface TextComponentPeer 
 
diff --git a/libjava/classpath/java/awt/peer/WindowPeer.java b/libjava/classpath/java/awt/peer/WindowPeer.java
index 8f136dd2d85..6c014de0b99 100644
--- a/libjava/classpath/java/awt/peer/WindowPeer.java
+++ b/libjava/classpath/java/awt/peer/WindowPeer.java
@@ -42,5 +42,19 @@ public interface WindowPeer extends ContainerPeer
 {
   void toBack();
   void toFront();
+  
+  /**
+   * FIXME: unknown.
+   * @since 1.5
+   */
+  void updateAlwaysOnTop();
+  
+  /**
+   * Request that this window peer be given the window focus.
+   * 
+   * @return true if the window received focus, false otherwise
+   * @since 1.5
+   */
+  boolean requestWindowFocus();
 } // interface WindowPeer