2006-11-21 Francis Kung <fkung@redhat.com>

	* gnu/java/awt/peer/gtk/BufferedImageGraphics.java
	(draw): Include stroke width when calculating bounds.
	(updateBufferedImage): Round bounds more generously, handle negative
	height/width values, and clip more intelligently.
	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
	(createPath): Add shortcut optimization for lines.
	(draw): Include stroke width when calculating bounds.
	(drawLine): Delegate to main draw() method.
	(drawRect): Likewise.
	(fillRect): Delegate to main fill() method.
	(findStrokedBounds): New method.
	(setCustomPaint): Round bounds more generously.
	* gnu/java/awt/peer/gtk/ComponentGraphics.java
	(drawLine): Removed.
	(drawRect): Removed.
	(fillRect): Removed.

1 files changed, 0 insertions, 51 deletions

diff --git a/gnu/java/awt/peer/gtk/ComponentGraphics.java b/gnu/java/awt/peer/gtk/ComponentGraphics.java
index c8ec2c95e..612efd628 100644
--- a/gnu/java/awt/peer/gtk/ComponentGraphics.java
+++ b/gnu/java/awt/peer/gtk/ComponentGraphics.java
@@ -480,57 +480,6 @@ public class ComponentGraphics extends CairoGraphics2D
     return super.drawImage(bimg, x, y, width, height, observer);
   }
 
-  public void drawLine(int x1, int y1, int x2, int y2)
-  {
-    lock();
-    try
-      {
-        if (comp == null || comp instanceof AlphaComposite)
-          super.drawLine(x1, y1, x2, y2);
-        
-        else
-          draw(new Line2D.Double(x1, y1, x2, y2));
-      }
-    finally
-      {
-        unlock();
-      }
-  }
-
-  public void drawRect(int x, int y, int width, int height)
-  {
-    lock();
-    try
-      {
-        if (comp == null || comp instanceof AlphaComposite)
-          super.drawRect(x, y, width, height);
-        
-        else
-          draw(new Rectangle2D.Double(x, y, width, height));
-      }
-    finally
-      {
-        unlock();
-      }
-  }
-
-  public void fillRect(int x, int y, int width, int height)
-  {
-    lock();
-    try
-      {
-        if (comp == null || comp instanceof AlphaComposite)
-          super.fillRect(x, y, width, height);
-        
-        else
-          fill(new Rectangle2D.Double(x, y, width, height));
-      }
-    finally
-      {
-        unlock();
-      }
-  }
-
   public void setClip(Shape s)
   {
     lock();