X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FWin32.java;h=0efdfa0534672361a014b4510f1780af8e942d70;hb=30aa8aa58f30808651a02e089c84998d6e054cbb;hp=b26fd38d9badf6f4b38e5e03132413189ffacc13;hpb=d3ccf61eac01b22a5133b876b9e19581015de13e;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index b26fd38..0efdfa0 100644
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -65,7 +65,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(int[] b, int w, int h) { return new Win32Picture(b, w, h); }
+    protected Picture _createPicture() { return new Win32Picture(); }
     protected native int _getScreenWidth();
     protected native int _getScreenHeight();
     protected boolean _supressDirtyOnResize() { return false; }
@@ -79,16 +79,16 @@ public class Win32 extends GCJ {
     protected synchronized HTTP.Proxy _detectProxy() {
 
         String[] container = new String[] { null, null, null };
-        if (Log.on) Log.log(this, "accessing Win32 registry");
+        if (Log.on) Log.info(this, "accessing Win32 registry");
         __detectProxy(container);
         if (container[2] == null && container[0] == null) {
-            if (Log.on) Log.log(this, "no proxy settings in the Win32 registry");
+            if (Log.on) Log.info(this, "no proxy settings in the Win32 registry");
             return null;
         }
         
-        if (Log.on) Log.log(this, "PAC Script URL: " + container[2]);
-        if (Log.on) Log.log(this, "Proxy Server String: " + container[0]);
-        if (Log.on) Log.log(this, "Proxy Override String: " + container[1]);
+        if (Log.on) Log.info(this, "PAC Script URL: " + container[2]);
+        if (Log.on) Log.info(this, "Proxy Server String: " + container[0]);
+        if (Log.on) Log.info(this, "Proxy Override String: " + container[1]);
 
         HTTP.Proxy ret = new HTTP.Proxy();
         if (container[2] != null) {
@@ -138,7 +138,7 @@ public class Win32 extends GCJ {
     protected native boolean _newBrowserWindow_(String url);
     protected void _newBrowserWindow(String url) {
         if (!_newBrowserWindow_(url))
-            if (Log.on) Log.log(this, "ShellExecuteEx() failed trying to open url " + url);
+            if (Log.on) Log.info(this, "ShellExecuteEx() failed trying to open url " + url);
     }
 
     // Win32Surface ////////////////////////////////////////////////////////////////////////////
@@ -229,8 +229,9 @@ public class Win32 extends GCJ {
         public int getWidth() { return w; };
         public int getHeight() { return h; };
         public int[] getData() { return data; }
+        boolean initialized = false;
+        public void init() { if (!initialized && isLoaded) natInit(); initialized = true; }
         public native void natInit();
-        public Win32Picture(int[] data, int w, int h) { this.w = w; this.h = h; this.data = data; natInit(); }
     }
     
 
@@ -263,10 +264,13 @@ public class Win32 extends GCJ {
 
         public native void fillRect(int x, int y, int x2, int y2, int color);
         public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
+            ((Win32Picture)source).init();
             drawPicture(source, dx, dy, cx1, cy1, cx2, cy2, 0, false);
         }
-        public void drawPictureAlphaOnly(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
-            drawPicture(source, dx, dy, cx1, cy1, cx2, cy2, rgb, true);
+        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)((Platform.DefaultGlyph)source).getPicture());
+            p.init();
+            drawPicture(p, dx, dy, cx1, cy1, cx2, cy2, rgb, true);
         }
         public native void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2,
                                        int rgb, boolean alphaOnly);