Mercurial > projects > dwt2

diff org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Widget.d @ 120:536e43f63c81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fb3aa8075988
children
line wrap: on
line diff
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Widget.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Widget.d	Sat Jul 09 15:50:20 2011 +0300
@@ -14,6 +14,7 @@
 
 import org.eclipse.swt.SWT;
 import java.lang.all;
+import java.nonstandard.UnsafeUtf;
 
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.internal.Converter;
@@ -26,10 +27,6 @@
 import org.eclipse.swt.widgets.TypedListener;
 
 import java.lang.Thread;
-version(Tango){
-import tango.stdc.string;
-} else { // Phobos
-}
 
 
 /**
@@ -961,31 +958,28 @@
 }
 
 char [] fixMnemonic (String str, bool replace) {
-    int len = str.length;
-    auto text = str[0 .. len].dup;
+    char[] text = str.dup;
     int i = 0, j = 0;
-    char [] result = new char [len * 2];
-    while (i < len) {
+    char [] result = new char [str.length * 2];
+    while (i < str.length) {
         switch (text [i]) {
             case '&':
-                if (i + 1 < len && text [i + 1] is '&') {
-                    i++;
+                if (i + 1 < str.length && text [i + 1] == '&') {
+                    result [j++] = text [i++];
                 } else {
-                    if (replace) {
-                        text [i] = '_';
-                    } else {
-                        i++;
-                    }
+                    if (replace) result [j++] = '_';
                 }
+                i++;
                 break;
             case '_':
                 if (replace) result [j++] = '_';
-                break;
+                //FALL THROUGH
             default:
+                result [j++] = text [i++];
         }
-        result [j++] = text [i++];
     }
-    return result[0..j];
+    if (j < result.length) result [j++] = 0;
+    return result[0 .. j];
 }
 
 /**
@@ -1345,14 +1339,14 @@
     while (index < chars.length) {
         Event event = new Event ();
         //PORTING take care of utf8
-        if (keyEvent !is null && chars.codepointCount() <= 1) {
+        if (keyEvent !is null && chars.UCScount() <= 1) {
             setKeyState (event, keyEvent);
         } else {
             setInputState (event, state);
         }
         //PORTING take care of utf8
         int incr;
-        event.character = cast(wchar) firstCodePoint( chars [index..$], incr );
+        event.character = cast(wchar) chars.dcharAt(index, incr);
         sendEvent (type, event);
 
         /*