diff org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet25.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/Snippet25.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet25.d	Sat Jul 09 15:50:20 2011 +0300
@@ -28,16 +28,17 @@
 import java.lang.all;
 
 version(Tango){
+    import tango.util.Convert;
     import tango.io.Stdout;
-    import tango.text.convert.Format;
-    import tango.util.Convert;
+    void writeln(in char[] line) {
+        Stdout(line)("\n").flush();
+    }
 } else { // Phobos
     import std.stdio;
-    import std.string;
     import std.conv;
 }
 
-static String stateMask (int stateMask) {
+String stateMask (int stateMask) {
 	String string = "";
 	if ((stateMask & SWT.CTRL) != 0) string ~= " CTRL";
 	if ((stateMask & SWT.ALT) != 0) string ~= " ALT";
@@ -46,7 +47,7 @@
 	return string;
 }
 
-static String character (wchar character) {
+String character (wchar character) {
 	switch (character) {
     case 0: 		return "'\\0'";
     case SWT.BS:	return "'\\b'";
@@ -60,7 +61,7 @@
 	}
 }
 
-static String keyCode (int keyCode) {
+String keyCode (int keyCode) {
 	switch (keyCode) {
 		
 		/* Keyboard and Mouse Masks */
@@ -144,18 +145,12 @@
 	Shell shell = new Shell (display);
 	Listener listener = new class Listener {
 		public void handleEvent (Event e) {
-			String string = e.type == SWT.KeyDown ? "DOWN:" : "UP  :";
-			version(Tango){
-				string ~= Format("stateMask=0x{:x}{},", e.stateMask, stateMask (e.stateMask));
-				string ~= Format(" keyCode=0x{:x} {},", e.keyCode, keyCode (e.keyCode));
-				string ~= Format(" character=0x{:x} {}", e.character, character (e.character));
-				Stdout.formatln (string);
-			} else { // Phobos
-				string ~= format("stateMask=0x%x%s,", e.stateMask, stateMask (e.stateMask));
-				string ~= format(" keyCode=0x%x %s,", e.keyCode, keyCode (e.keyCode));
-				string ~= format(" character=0x%x %s", e.character, character (e.character));
-				writefln (string);
-			}
+			String string = Format("{} stateMask=0x{:x}{}, keyCode=0x{:x} {}, character=0x{:x} {}",
+				e.type == SWT.KeyDown ? "DOWN:" : "UP  :",
+				e.stateMask, stateMask (e.stateMask),
+				e.keyCode, keyCode (e.keyCode),
+				e.character, character (e.character));
+			writeln(string);
 		}
 	};
 	shell.addListener (SWT.KeyDown, listener);