--- a/JavaVM.st	Wed Dec 23 16:51:19 1998 +0000
+++ b/JavaVM.st	Wed Dec 23 19:27:30 1998 +0000
@@ -30,7 +30,8 @@
 		NoAudio FirstWindowCreationSemaphore ScreenUpdaterProcess
 		PermittedDirectories PermittedHostConnects SimulatedOS
 		O_WGgraphics_originX O_WGgraphics_originY O_WGgraphics_pData
-		O_FramePeer_pNativeWidget O_FramePeer_pData'
+		O_FramePeer_pNativeWidget O_FramePeer_pData ImageStretchCache
+		LastGraphics LastGC'
 	poolDictionaries:''
 	category:'Java-Support'
 !
@@ -1698,6 +1699,7 @@
     LoadedNativeLibs := nil.       "/ gc will reclaim them ...
     
     ImageStretchCache := nil.
+    LastGraphics := LastGC := nil.
 
     self terminateAllThreads.
 
@@ -1709,7 +1711,7 @@
     "
 
     "Created: / 7.1.1998 / 22:49:42 / cg"
-    "Modified: / 5.11.1998 / 20:07:02 / cg"
+    "Modified: / 23.12.1998 / 19:01:38 / cg"
 !
 
 releaseAllMonitors
@@ -2298,7 +2300,7 @@
 !
 
 gcForWGraphics:nativeContext
-    |jGraphics gc orgX orgY trans|
+    |jGraphics gc orgX orgY trans tX tY|
 
     jGraphics := nativeContext receiver.
     O_WGgraphics_pData isNil ifTrue:[
@@ -2312,16 +2314,21 @@
     ].
     gc := jGraphics instVarAt:O_WGgraphics_pData.
 
-    trans := gc translation.
+"/    trans := gc translation.
+"/    tX := trans x.
+"/    tY := trans y.
+    tX := gc translationX.
+    tY := gc translationY.
+
     orgX := jGraphics instVarAt:O_WGgraphics_originX.
     orgY := jGraphics instVarAt:O_WGgraphics_originY.
-    ((orgX ~~ trans x) or:[orgY ~~ trans y]) ifTrue:[
+    ((orgX ~~ tX) or:[orgY ~~ tY]) ifTrue:[
         gc translation:orgX@orgY
     ].
     ^ gc
 
     "Created: / 8.1.1998 / 00:16:38 / cg"
-    "Modified: / 19.11.1998 / 01:44:12 / cg"
+    "Modified: / 23.12.1998 / 19:05:45 / cg"
 !
 
 jPeerForView:aView
@@ -4740,13 +4747,13 @@
 "/    ].
 
     "/ how about domain errors ?
-    dVal < 0 ifTrue:[
+"/    dVal < 0 ifTrue:[
 "/        ^ 0.0
-    ].
+"/    ].
     ^ dVal sqrt
 
     "Created: / 7.1.1998 / 15:42:40 / cg"
-    "Modified: / 11.11.1998 / 15:06:55 / cg"
+    "Modified: / 23.12.1998 / 19:15:03 / cg"
 !
 
 _Math_tan:nativeContext
@@ -5670,22 +5677,23 @@
 
     |jThread stProcess|
 
-    jThread := nativeContext receiver.
-    stProcess := JavaVM stProcessForJavaThread:jThread.
-    stProcess isNil ifTrue:[
-        ThreadTrace == true ifTrue:[
-            ('JAVA: no stProcess for javaThread: ' , jThread displayString) printNL.
-        ].
-        ^ nil "void"
-    ].
-    stProcess == Processor activeProcess ifTrue:[
-        Processor yield.
-    ] ifFalse:[
-        self halt.
-    ].
+    Processor yield.
+"/    jThread := nativeContext receiver.
+"/    stProcess := JavaVM stProcessForJavaThread:jThread.
+"/    stProcess isNil ifTrue:[
+"/        ThreadTrace == true ifTrue:[
+"/            ('JAVA: no stProcess for javaThread: ' , jThread displayString) printNL.
+"/        ].
+"/        ^ nil "void"
+"/    ].
+"/    stProcess == Processor activeProcess ifTrue:[
+"/        Processor yield.
+"/    ] ifFalse:[
+"/        self halt.
+"/    ].
 
     "Created: / 5.1.1998 / 02:03:51 / cg"
-    "Modified: / 6.2.1998 / 02:15:29 / cg"
+    "Modified: / 23.12.1998 / 19:19:17 / cg"
 !
 
 _Throwable_fillInStackTrace:nativeContext
@@ -7449,11 +7457,12 @@
 !
 
 _WChoicePeer_reshape:nativeContext
-    self pReshape:nativeContext.
+    self commonReshapeComponent:nativeContext.
+"/    self pReshape:nativeContext.
     ^ self.
 
-    "Modified: / 15.8.1997 / 15:36:29 / cg"
     "Created: / 7.1.1998 / 21:46:18 / cg"
+    "Modified: / 23.12.1998 / 19:08:07 / cg"
 !
 
 _WChoicePeer_select:nativeContext
@@ -8713,7 +8722,7 @@
     ^ rect
 
     "Created: / 6.1.1998 / 20:58:07 / cg"
-    "Modified: / 11.12.1998 / 13:37:17 / cg"
+    "Modified: / 23.12.1998 / 20:14:09 / cg"
 !
 
 _WGraphics_imageCreate:nativeContext        
@@ -8754,13 +8763,13 @@
     rgb := nativeContext argAt:1.
 
     clr := Color rgbValue:rgb.
-    gc paint:clr.
+    gc paint:(clr nearestOn:gc device).
 
 "/ self halt.
 "/ self internalError:'breakPoint'.
 
     "Created: / 6.1.1998 / 20:56:14 / cg"
-    "Modified: / 8.1.1998 / 00:34:51 / cg"
+    "Modified: / 23.12.1998 / 20:10:49 / cg"
 !
 
 _WGraphics_print:nativeContext
@@ -10827,6 +10836,6 @@
 !JavaVM class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.104 1998/12/23 16:51:19 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.105 1998/12/23 19:26:33 cg Exp $'
 ! !
 JavaVM initialize!