diff org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet294.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 9f4c18c268b2
children
line wrap: on
line diff
--- a/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet294.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet294.d	Sat Jul 09 15:50:20 2011 +0300
@@ -12,7 +12,14 @@
  *******************************************************************************/
 module org.eclipse.swt.snippets.Snippet294;
 
-/* Port OK */
+/*
+ * Region on a control: create a non-rectangular button
+ *
+ * For a list of all SWT example snippets see
+ * http://www.eclipse.org/swt/snippets/
+ *
+ * @since 3.4
+ */
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Region;
@@ -30,69 +37,53 @@
     import std.conv;
 }
 
-void main(String[] args){
-    Snippet294.main(args);
+int[] circle(int r, int offsetX, int offsetY) {
+    int[] polygon = new int[8 * r + 4];
+    // x^2 + y^2 = r^2
+    for (int i = 0; i < 2 * r + 1; i++) {
+        int x = i - r;
+        int y = cast(int)Math.sqrt(cast(real)(r*r - x*x));
+        polygon[2*i] = offsetX + x;
+        polygon[2*i+1] = offsetY + y;
+        polygon[8*r - 2*i - 2] = offsetX + x;
+        polygon[8*r - 2*i - 1] = offsetY - y;
+    }
+    return polygon;
 }
 
-/*
- * Region on a control: create a non-rectangular button
- *
- * For a list of all SWT example snippets see
- * http://www.eclipse.org/swt/snippets/
- *
- * @since 3.4
- */
-
-public class Snippet294 {
+void main() {
+    Display display = new Display();
+    Shell shell = new Shell(display);
+    shell.setText("Regions on a Control");
+    shell.setLayout(new FillLayout());
+    shell.setBackground(display.getSystemColor(SWT.COLOR_DARK_RED));
 
-    static int[] circle(int r, int offsetX, int offsetY) {
-        int[] polygon = new int[8 * r + 4];
-        // x^2 + y^2 = r^2
-        for (int i = 0; i < 2 * r + 1; i++) {
-            int x = i - r;
-            int y = cast(int)Math.sqrt(cast(real)(r*r - x*x));
-            polygon[2*i] = offsetX + x;
-            polygon[2*i+1] = offsetY + y;
-            polygon[8*r - 2*i - 2] = offsetX + x;
-            polygon[8*r - 2*i - 1] = offsetY - y;
-        }
-        return polygon;
-    }
+    Button b2 = new Button(shell, SWT.PUSH);
+    b2.setText("Button with Regions");
+
+    // define a region that looks like a circle with two holes in ot
+    Region region = new Region();
+    region.add(circle(67, 87, 77));
+    region.subtract(circle(20, 87, 47));
+    region.subtract(circle(20, 87, 113));
 
-    public static void main(String[] args) {
-        Display display = new Display();
-        Shell shell = new Shell(display);
-        shell.setText("Regions on a Control");
-        shell.setLayout(new FillLayout());
-        shell.setBackground(display.getSystemColor(SWT.COLOR_DARK_RED));
+    // define the shape of the button using setRegion
+    b2.setRegion(region);
+    b2.setLocation(100,50);
 
-        Button b2 = new Button(shell, SWT.PUSH);
-        b2.setText("Button with Regions");
-
-        // define a region that looks like a circle with two holes in ot
-        Region region = new Region();
-        region.add(circle(67, 87, 77));
-        region.subtract(circle(20, 87, 47));
-        region.subtract(circle(20, 87, 113));
+    b2.addListener(SWT.Selection, new class Listener {
+        public void handleEvent(Event e) {
+            shell.close();
+        }
+    });
 
-        // define the shape of the button using setRegion
-        b2.setRegion(region);
-        b2.setLocation(100,50);
-
-        b2.addListener(SWT.Selection, new class() Listener {
-                public void handleEvent(Event e) {
-                shell.close();
-                }
-                });
+    shell.setSize(200,200);
+    shell.open();
 
-        shell.setSize(200,200);
-        shell.open();
-
-        while (!shell.isDisposed()) {
-            if (!display.readAndDispatch())
-                display.sleep();
-        }
-        region.dispose();
-        display.dispose();
+    while (!shell.isDisposed()) {
+        if (!display.readAndDispatch())
+            display.sleep();
     }
+    region.dispose();
+    display.dispose();
 }