diff org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet119.d @ 120:536e43f63c81

Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661 ===D2=== * added [Try]Immutable/Const/Shared templates to work with differenses in D1/D2 instead of version statements used these templates to work with strict type storage rules of dmd-2.053 * com.ibm.icu now also compilable with D2, but not tested yet * small fixes Snippet288 - shared data is in TLS ===Phobos=== * fixed critical bugs in Phobos implemention completely incorrect segfault prone fromStringz (Linux's port ruthless killer) terrible, incorrect StringBuffer realization (StyledText killer) * fixed small bugs as well Snippet72 - misprint in the snippet * implemented missed functionality for Phobos ByteArrayOutputStream implemented (image loading available) formatting correctly works for all DWT's cases As a result, folowing snippets now works with Phobos (Snippet### - what is fixed): Snippet24, 42, 111, 115, 130, 235, 276 - bad string formatting Snippet48, 282 - crash on image loading Snippet163, 189, 211, 213, 217, 218, 222 - crash on copy/cut in StyledText Snippet244 - hang-up ===Tango=== * few changes for the latest Tango trunc-r5661 * few small performance improvments ===General=== * implMissing-s for only one version changed to implMissingInTango/InPhobos * incorrect calls to Format in toString-s fixed * fixed loading \uXXXX characters in ResourceBundle * added good UTF-8 support for StyledText, TextLayout (Win32) and friends UTF functions revised and tested. It is now in java.nonstandard.*Utf modules StyledText and TextLayout (Win32) modules revised for UTF-8 support * removed small diferences in most identical files in *.swt.* folders *.swt.internal.image, *.swt.events and *.swt.custom are identical in Win32/Linux32 now 179 of 576 (~31%) files in *.swt.* folders are fully identical * Win32: snippets now have right subsystem, pretty icons and native system style controls * small fixes in snippets Snippet44 - it's not Snippet44 Snippet212 - functions work with different images and offsets arrays Win32: Snippet282 - crash on close if the button has an image Snippet293 - setGrayed is commented and others Win32: As a result, folowing snippets now works Snippet68 - color doesn't change Snippet163, 189, 211, 213, 217, 218, 222 - UTF-8 issues (see above) Snippet193 - no tabel headers
author Denis Shelomovskij <verylonglogin.reg@gmail.com>
date Sat, 09 Jul 2011 15:50:20 +0300
parents 69b1fa94a4a8
children
line wrap: on
line diff
--- a/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet119.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet119.d	Sat Jul 09 15:50:20 2011 +0300
@@ -35,7 +35,7 @@
 
 
 
-static byte[] srcData = [
+auto srcData = [
         cast(byte)0x11, cast(byte)0x11, cast(byte)0x11, cast(byte)0x00, cast(byte)0x00, cast(byte)0x11, cast(byte)0x11, cast(byte)0x11,
         cast(byte)0x11, cast(byte)0x10, cast(byte)0x00, cast(byte)0x01, cast(byte)0x10, cast(byte)0x00, cast(byte)0x01, cast(byte)0x11,
         cast(byte)0x11, cast(byte)0x00, cast(byte)0x22, cast(byte)0x01, cast(byte)0x10, cast(byte)0x33, cast(byte)0x00, cast(byte)0x11,
@@ -54,7 +54,7 @@
         cast(byte)0x11, cast(byte)0x11, cast(byte)0x11, cast(byte)0x00, cast(byte)0x00, cast(byte)0x11, cast(byte)0x11, cast(byte)0x11,
 ];
 
-static byte[] mskData = [
+auto mskData = [
         cast(byte)0x03, cast(byte)0xc0,
         cast(byte)0x1f, cast(byte)0xf8,
         cast(byte)0x3f, cast(byte)0xfc,
@@ -85,11 +85,11 @@
     //Create a source ImageData of depth 4
     PaletteData palette = new PaletteData ([black.getRGB(), white.getRGB(), yellow.getRGB(),
                                             red.getRGB(), blue.getRGB(), green.getRGB()]);
-    ImageData sourceData = new ImageData (16, 16, 4, palette, 1, srcData);
+    ImageData sourceData = new ImageData (16, 16, 4, palette, 1, srcData[]);
 
     //Create a mask ImageData of depth 1 (monochrome)
     palette = new PaletteData ([black.getRGB(), white.getRGB()]);
-    ImageData maskData = new ImageData (16, 16, 1, palette, 1, mskData);
+    ImageData maskData = new ImageData (16, 16, 1, palette, 1, mskData[]);
 
     //Set mask
     sourceData.maskData = maskData.data;
@@ -105,7 +105,7 @@
     Shell shell = new Shell(display);
     Image source = new Image (display,sourceData);
     Image mask = new Image (display, maskData);
-    shell.addPaintListener(new class() PaintListener{
+    shell.addPaintListener(new class PaintListener{
         public void paintControl(PaintEvent e) {
             GC gc = e.gc;
             int x = 10, y = 10;