[re]-merged in Brians stuff

[org.ibex.core.git] / src / org / ibex / plat / Win32.java

diff --git a/src/org/ibex/plat/Win32.java b/src/org/ibex/plat/Win32.java
index 592baf9..586b675 100644 (file)
--- a/src/org/ibex/plat/Win32.java
+++ b/src/org/ibex/plat/Win32.java
@@ -1,10 +1,12 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]
 package org.ibex.plat;
 
-import org.ibex.*;
 import org.ibex.util.*;
 import java.util.*;
 import org.ibex.js.*;
+import org.ibex.graphics.*;
+import org.ibex.core.*;
+import org.ibex.net.*;
 
 /** Platform specific code for GCJ-compiled Win32 binaries */
 public class Win32 extends GCJ {
@@ -83,7 +85,8 @@ public class Win32 extends GCJ {
 
         HTTP.Proxy ret = new HTTP.Proxy();
         if (container[2] != null) {
-            ret.proxyAutoConfigFunction = HTTP.Proxy.getProxyAutoConfigFunction(container[2]);
+           // FIXME!!!
+            //ret.proxyAutoConfigFunction = HTTP.Proxy.getProxyAutoConfigFunction(container[2]);
             if (ret.proxyAutoConfigFunction != null) return ret;
         }
 
@@ -257,7 +260,7 @@ public class Win32 extends GCJ {
             ((Win32Picture)source).init();
             drawPicture(source, dx, dy, cx1, cy1, cx2, cy2, 0, false);
         }
-        public void drawGlyph(org.ibex.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
+        public void drawGlyph(org.ibex.graphics.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
             Win32Picture p = ((Win32Picture)((Platform.DefaultGlyph)source).getPicture());
             p.init();
             drawPicture(p, dx, dy, cx1, cy1, cx2, cy2, rgb, true);