2006-02-23 Scott Gilbertson <scottg@mantatest.com>

	* gnu/awt/j2d/IntegerGraphicsState.java (getClip): Clone clip
	before returning, handle null clip.
	(getClipBounds): Handle null clip.
	* gnu/awt/j2d/Graphics2DImpl.java (clipRect): Handle null clip.
	* gnu/awt/xlib/XCanvasPeer.java (): 
	(getLocationOnScreen): Implement.
	* classpath/gnu/java/awt/peer/GLightweightPeer.java
	(repaint): Merged with Classpath.
	* classpath/java/awt/Graphics.java (hitClip): Merged with
	Classpath.


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

1 files changed, 6 insertions, 0 deletions

diff --git a/libjava/gnu/awt/j2d/Graphics2DImpl.java b/libjava/gnu/awt/j2d/Graphics2DImpl.java
index dd46e7fe410..5091af69f69 100644
--- a/libjava/gnu/awt/j2d/Graphics2DImpl.java
+++ b/libjava/gnu/awt/j2d/Graphics2DImpl.java
@@ -175,6 +175,12 @@ public class Graphics2DImpl extends Graphics2D implements Cloneable
   public void clipRect(int x, int y, int width, int height)
   {
     Shape clip = state.getClip();
+    if (clip == null)
+    {
+      clip = new Rectangle (x,y,width,height);
+      setClip (clip);
+      return;
+    }
     if (clip instanceof Rectangle)
       {
 	Rectangle clipRect = (Rectangle) clip;