--- a/JavaVM.st	Tue Oct 20 17:02:33 1998 +0000
+++ b/JavaVM.st	Tue Oct 20 17:40:46 1998 +0000
@@ -6098,10 +6098,6 @@
 
     gc := self gcForWGraphics:nativeContext.
 
-"/ ignored for now;
-"/ Clock does incorrect repaints if enabled.
-"/ TODO: fix that ...
-
     x := nativeContext argAt:1.
     y := nativeContext argAt:2.
     w := nativeContext argAt:3.
@@ -6109,11 +6105,11 @@
     bool := (nativeContext argAt:5) ~~ 0.
 
     r := Rectangle left:x top:y width:w height:h.
-"/ 'clip: ' print. r printCR.
+"/ 'WGraphics_changeClip: ' infoPrint. r infoPrintCR.
     gc clippingRectangle:r.
 
     "Created: / 6.1.1998 / 20:57:21 / cg"
-    "Modified: / 19.10.1998 / 23:39:53 / cg"
+    "Modified: / 20.10.1998 / 19:40:10 / cg"
 !
 
 _WGraphics_clearRect:nativeContext
@@ -6177,9 +6173,10 @@
 
     view := KnownWindows at:jWin ifAbsent:nil.
     view isNil ifTrue:[
-	self halt.
-	^ self
-    ].
+        self halt.
+        ^ self
+    ].
+    view clippingRectangle:nil.
 
 "/    "/ just a consistency check ...
 "/    (jWin instVarNamed:'xid') ~~ view ifTrue:[
@@ -6189,7 +6186,7 @@
     jGraphics instVarNamed:'pData' put:view.
 
     "Created: / 6.1.1998 / 20:55:18 / cg"
-    "Modified: / 15.1.1998 / 13:49:56 / cg"
+    "Modified: / 20.10.1998 / 19:38:18 / cg"
 !
 
 _WGraphics_createFromGraphics:nativeContext
@@ -6200,9 +6197,10 @@
     gc := graphics instVarNamed:'pData'.
 
     jGraphics instVarNamed:'pData' put:gc.
+    gc clippingRectangle:nil.
 
     "Created: / 8.1.1998 / 00:47:39 / cg"
-    "Modified: / 25.1.1998 / 10:57:25 / cg"
+    "Modified: / 20.10.1998 / 19:37:58 / cg"
 !
 
 _WGraphics_dispose:nativeContext
@@ -6210,9 +6208,10 @@
 
     gc := self gcForWGraphics:nativeContext.
     gc isNil ifTrue:[^ self].
+    gc clippingRectangle:nil.
 
     "Created: / 6.1.1998 / 20:58:38 / cg"
-    "Modified: / 8.1.1998 / 00:19:09 / cg"
+    "Modified: / 20.10.1998 / 19:35:05 / cg"
 !
 
 _WGraphics_drawArc:nativeContext
@@ -6496,35 +6495,33 @@
     (gc isMemberOf:JavaView) ifTrue:[
         "/ r := gc clippingRectangleOrNil. 
         r := gc getNextUpdateRectangle.
-        r isNil ifTrue:[
-"/ ^ nil.
-            x := y := 0.
-            w := (gc width).
-            h := (gc height).
-        ] ifFalse:[
-            x := (r left).
-            y := (r top).
-            w := (r width).
-            h := (r height).
-        ]
-    ] ifFalse:[
+    ].
+    r isNil ifTrue:[
+        r := gc clippingRectangleOrNil. 
+    ].
+
+    r isNil ifTrue:[
         x := y := 0.
-"/        w := h := 9999.
         w := (gc width).
         h := (gc height).
+    ] ifFalse:[
+        x := (r left).
+        y := (r top).
+        w := (r width).
+        h := (r height).
     ].
     rect instVarNamed:'x' put:x.
     rect instVarNamed:'y' put:y.
     rect instVarNamed:'width' put:w.
     rect instVarNamed:'height' put:h.
 
-"/ 'JAVA: getClipBounds' infoPrintCR.
+ 'WGraphics__getClipBounds ' infoPrint. (x@y extent:w@h) infoPrintCR.
 "/ self halt.
 
     ^ rect
 
     "Created: / 6.1.1998 / 20:58:07 / cg"
-    "Modified: / 19.10.1998 / 23:38:14 / cg"
+    "Modified: / 20.10.1998 / 19:26:34 / cg"
 !
 
 _WGraphics_imageCreate:nativeContext        
@@ -8072,6 +8069,6 @@
 !JavaVM class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.47 1998/10/20 17:02:33 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.48 1998/10/20 17:40:46 cg Exp $'
 ! !
 JavaVM initialize!