diff --git a/collects/htdch/draw/Canvas.java b/collects/htdch/draw/Canvas.java index 96ed7219db..b7ce3cdf55 100644 --- a/collects/htdch/draw/Canvas.java +++ b/collects/htdch/draw/Canvas.java @@ -94,23 +94,4 @@ public class Canvas { */ public native boolean drawString(Posn p, String s); - /** - *@return true, if it can erase the specified circle from this canvas - */ - public native boolean clearCircle(Posn p, int r, AColor c); - - /** - *@return true, if it can erase the specified disk from this canvas - */ - public native boolean clearDisk(Posn p, int r, AColor c); - - /** - *@return true, if it can erase the specified rectangle from this canvas - */ - public native boolean clearRect(Posn p, int width, int height, AColor c); - - /** - *@return true, if it can erase the specified string from this canvas - */ - public native boolean clearLine(Posn p0, Posn p1, AColor c); } diff --git a/collects/htdch/draw/World.java b/collects/htdch/draw/World.java index e5d444f5ab..3c20847b88 100644 --- a/collects/htdch/draw/World.java +++ b/collects/htdch/draw/World.java @@ -71,8 +71,4 @@ public abstract class World { */ public abstract boolean draw(); - /** - *@return true, if the method succeeds in erasing this world ('s canvas) - */ - public abstract boolean erase(); } diff --git a/collects/htdch/draw/support.scm b/collects/htdch/draw/support.scm index 428b2b7149..4d6bf78337 100644 --- a/collects/htdch/draw/support.scm +++ b/collects/htdch/draw/support.scm @@ -26,10 +26,7 @@ drawRect-geometry.Posn-int-int-colors.AColor-native drawLine-geometry.Posn-geometry.Posn-colors.AColor-native drawString-geometry.Posn-java.lang.String-native - clearCircle-geometry.Posn-int-colors.AColor-native - clearDisk-geometry.Posn-int-colors.AColor-native - clearRect-geometry.Posn-int-int-colors.AColor-native - clearLine-geometry.Posn-geometry.Posn-colors.AColor-native)) + )) (define-signature support^ (void-or-true imperative)) @@ -146,22 +143,26 @@ (wrap-start-check ([hash-table-get privates '%draw-string] (build-posn p) s*))) + #; (define (clearCircle-geometry.Posn-int-colors.AColor-native this accs gets privates p r c) (wrap-start-check (check-arg r "clearCircle(Posn, int, AColor)" "second") ([hash-table-get privates '%clear-circle] (build-posn p) r (color->symbol c)))) - + + #; (define (clearDisk-geometry.Posn-int-colors.AColor-native this accs gets privates p r c) (wrap-start-check (check-arg r "clearDisk(Posn, int, AColor)" "second") ([hash-table-get privates '%clear-solid-disk] (build-posn p) r (color->symbol c)))) + #; (define (clearRect-geometry.Posn-int-int-colors.AColor-native this accs gets privates p w h c) (wrap-start-check (check-arg w "clearRect(Posn, int, int, AColor)" "second") (check-arg h "clearRect(Posn, int, int, AColor)" "third") ([hash-table-get privates '%clear-solid-rect] (build-posn p) w h (color->symbol c)))) + #; (define (clearLine-geometry.Posn-geometry.Posn-colors.AColor-native this accs gets privates p0 p1 c) (wrap-start-check ([hash-table-get privates '%clear-solid-line] (build-posn p0) (build-posn p1) (color->symbol c)))) @@ -181,7 +182,7 @@ (define (on-event world0 th) (begin-draw-sequence) (send theCanvas copy) - (send world0 erase) + ;(send world0 erase) (let ([world (imperative (th) world0)]) (unless (eq? world0 world) (setCanvas world theCanvas)) diff --git a/collects/htdch/idraw/Canvas.java b/collects/htdch/idraw/Canvas.java index 6eacd037ee..64a0766050 100644 --- a/collects/htdch/idraw/Canvas.java +++ b/collects/htdch/idraw/Canvas.java @@ -40,8 +40,4 @@ public class Canvas { public native void drawRect(Posn p, int width, int height, AColor c); public native void drawLine(Posn p0, Posn p1, AColor c); public native void drawString(Posn p, String s); - public native void clearCircle(Posn p, int r, AColor c); - public native void clearDisk(Posn p, int r, AColor c); - public native void clearRect(Posn p, int width, int height, AColor c); - public native void clearLine(Posn p0, Posn p1, AColor c); } diff --git a/collects/htdch/idraw/World.java b/collects/htdch/idraw/World.java index c70e5ef51a..6e728b4d71 100644 --- a/collects/htdch/idraw/World.java +++ b/collects/htdch/idraw/World.java @@ -31,5 +31,4 @@ public abstract class World { public abstract void onTick(); public abstract void onKeyEvent(String ke); public abstract void draw(); - public abstract void erase(); }