Mercurial > projects > dwt2

diff org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CLabel.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 c01d033c633a
children
line wrap: on
line diff
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CLabel.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CLabel.d	Sat Jul 09 15:50:20 2011 +0300
@@ -38,13 +38,9 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
+
 import java.lang.all;
-
-version(Tango){
-static import tango.text.Unicode;
-static import tango.text.convert.Utf;
-} else { // Phobos
-}
+import java.nonstandard.UnsafeUtf;
 
 /**
  * A Label which supports aligned text and/or an image and different border styles.
@@ -179,7 +175,7 @@
 //protected void checkSubclass () {
 //  String name = getClass().getName ();
 //  String validName = CLabel.class.getName();
-//  if (!validName.equals(name)) {
+//  if (validName != (name)) {
 //      SWT.error (SWT.ERROR_INVALID_SUBCLASS);
 //  }
 //}
@@ -216,14 +212,14 @@
  * an '&' character in the given string. If there are no '&'
  * characters in the given string, return '\0'.
  */
-dchar _findMnemonic (String string) {
-    if (string is null) return '\0';
+dchar _findMnemonic (String str) {
+    if (str is null) return '\0';
     int index = 0;
-    int length = string.length;
+    int length = str.length;
     do {
-        while (index < length && string[index] !is '&') index++;
+        while (index < length && str[index] !is '&') index++;
         if (++index >= length) return '\0';
-        if (string[index] !is '&') return Character.toLowerCase (string.dcharAt (index));
+        if (str[index] !is '&') return Character.toLowerCase( str.dcharAt(index) );
         index++;
     } while (index < length);
     return '\0';
@@ -310,9 +306,7 @@
         public void getKeyboardShortcut(AccessibleEvent e) {
             dchar mnemonic = _findMnemonic(this.outer.text);
             if (mnemonic !is '\0') {
-                dchar[1] d;
-                d[0] = mnemonic;
-                e.result = Format("Alt+{}", d); //$NON-NLS-1$
+                e.result = "Alt+" ~ dcharToString(mnemonic); //$NON-NLS-1$
             }
         }
     });
@@ -828,8 +822,8 @@
     String[] lines = new String[1];
     int start = 0, pos;
     do {
-        pos = text.indexOf( '\n', start);
-        if (pos is -1 ) {
+        pos = text.indexOf('\n', start);
+        if (pos is -1) {
             lines[lines.length - 1] = text[start .. $ ];
         } else {
             bool crlf = (pos > 0) && (text[ pos - 1 ] is '\r');
@@ -839,7 +833,7 @@
             System.arraycopy(lines, 0, newLines, 0, lines.length);
             lines = newLines;
         }
-    } while (pos !is text.length);
+    } while (pos !is -1);
     return lines;
 }
 }