X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FWin32.java;h=0204b4d69a5e14dc3269d81ce6e3aa75f8b14d72;hb=6648a20efb79368af2fb16d1694afa685c04a0fc;hp=938b6c27befe68b777ee0555d2af40ccdd5f9e3b;hpb=e2dedbcad71fdf6df74abe5c43516a4d88d145d3;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index 938b6c2..0204b4d 100644
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -1,9 +1,10 @@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [LGPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]
 package org.xwt.plat;
 
 import org.xwt.*;
 import org.xwt.util.*;
 import java.util.*;
+import org.xwt.js.*;
 import java.io.*;
 
 /** Platform specific code for GCJ-compiled Win32 binaries */
@@ -43,16 +44,7 @@ public class Win32 extends GCJ {
 
     public Win32() { }
 
-    public void init() {
-        String logfile = getTempPath() + "xwt-log.txt";
-        try {
-            PrintStream ps = new PrintStream(new FileOutputStream(logfile));
-            System.setOut(ps);
-            System.setErr(ps);
-        } catch (Throwable e) {
-            criticalAbort("Exception while attempting to redirect logging to " + logfile + " -- " + e);
-        }
-
+    public void postInit() {
         new Thread() { public void run() { natInit(); } }.start();
         messagePumpStarted.block();
     }
@@ -65,7 +57,7 @@ public class Win32 extends GCJ {
     protected String getDescriptiveName() { return "GCJ Win32 Binary"; }
     protected Surface _createSurface(Box b, boolean framed) { return new Win32Surface(b, framed); }
     protected PixelBuffer _createPixelBuffer(int w, int h, Surface owner) { return new Win32PixelBuffer(w, h, (Win32Surface)owner); }
-    protected Picture _createPicture() { return new Win32Picture(); }
+    protected Picture _createPicture(JS r) { return new Win32Picture(r); }
     protected native int _getScreenWidth();
     protected native int _getScreenHeight();
     protected boolean _supressDirtyOnResize() { return false; }
@@ -92,8 +84,8 @@ public class Win32 extends GCJ {
 
         HTTP.Proxy ret = new HTTP.Proxy();
         if (container[2] != null) {
-            ret.proxyAutoConfigJSFunction = HTTP.Proxy.getProxyAutoConfigJSFunction(container[2]);
-            if (ret.proxyAutoConfigJSFunction != null) return ret;
+            ret.proxyAutoConfigFunction = HTTP.Proxy.getProxyAutoConfigFunction(container[2]);
+            if (ret.proxyAutoConfigFunction != null) return ret;
         }
 
         if (container[0] == null) return null;
@@ -205,8 +197,6 @@ public class Win32 extends GCJ {
     // Win32Picture ////////////////////////////////////////////////////////////////////////////
 
     public static class Win32Picture extends Picture {
-        int w = 0, h = 0;
-        int[] data = null;
 
         /** the Win32 bitmap version of this Picture */
         int hbitmap = -1;
@@ -226,8 +216,9 @@ public class Win32 extends GCJ {
         /** dc of the mask */
         int maskdc = -1;
 
-        public int getWidth() { return w; };
-        public int getHeight() { return h; };
+        public Win32Picture(JS r) { super(r); }
+        public int getWidth() { return width; };
+        public int getHeight() { return height; };
         public int[] getData() { return data; }
         boolean initialized = false;
         public void init() { if (!initialized && isLoaded) natInit(); initialized = true; }
@@ -268,7 +259,7 @@ public class Win32 extends GCJ {
             drawPicture(source, dx, dy, cx1, cy1, cx2, cy2, 0, false);
         }
         public void drawGlyph(org.xwt.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
-            Win32Picture p = ((Win32Picture)((DefaultGlyph)source).getPicture());
+            Win32Picture p = ((Win32Picture)((Platform.DefaultGlyph)source).getPicture());
             p.init();
             drawPicture(p, dx, dy, cx1, cy1, cx2, cy2, rgb, true);
         }