2003/02/12 06:31:52

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

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index 5485540..a6551df 100644 (file)
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -123,7 +123,7 @@ public class Win32 extends GCJ {
 
     private native void __detectProxy(String[] container);
 
-    protected synchronized HTTP.ProxyInfo _detectProxy() {
+    protected synchronized Proxy _detectProxy() {
 
         String[] container = new String[] { null, null, null };
         if (Log.on) Log.log(this, "accessing Win32 registry");
@@ -137,9 +137,9 @@ public class Win32 extends GCJ {
         if (Log.on) Log.log(this, "Proxy Server String: " + container[0]);
         if (Log.on) Log.log(this, "Proxy Override String: " + container[1]);
 
-        HTTP.ProxyInfo ret = new HTTP.ProxyInfo();
+        Proxy ret = new Proxy();
         if (container[2] != null) {
-            ret.proxyAutoConfigFunction = HTTP.ProxyInfo.getProxyAutoConfigFunction(container[2]);
+            ret.proxyAutoConfigFunction = Proxy.getProxyAutoConfigFunction(container[2]);
             if (ret.proxyAutoConfigFunction != null) return ret;
         }
 
@@ -205,7 +205,7 @@ public class Win32 extends GCJ {
         boolean captured = false;
 
         public int hwnd = -1;
-        public int hdc = -1;
+        public int hdc = 0;
 
         public int current_cursor = default_cursor;
 
@@ -251,7 +251,7 @@ public class Win32 extends GCJ {
 
     // Win32Picture ////////////////////////////////////////////////////////////////////////////
 
-    public static class Win32Picture implements Picture {
+    public static class Win32Picture extends Picture {
         int w = 0, h = 0;
         int[] data = null;
 
@@ -283,7 +283,7 @@ public class Win32 extends GCJ {
 
     // Win32DoubleBuffer //////////////////////////////////////////////////////////////////////////
 
-    public static class Win32DoubleBuffer implements DoubleBuffer {
+    public static class Win32DoubleBuffer extends DoubleBuffer {
 
         int w = 0;
         int h = 0;