Mercurial > projects > dwt2

diff org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/GC.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 0ecb2b338560
children
line wrap: on
line diff
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/GC.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/GC.d	Sat Jul 09 15:50:20 2011 +0300
@@ -244,7 +244,7 @@
             }
         }
         if ((state & LINE_STYLE) !is 0) {
-            float[] dashes = null;
+            TryConst!(float)[] dashes = null;
             float dashOffset = 0;
             int dashStyle = Gdip.DashStyleSolid;
             switch (data.lineStyle) {
@@ -256,12 +256,13 @@
                 case SWT.LINE_CUSTOM: {
                     if (data.lineDashes !is null) {
                         dashOffset = data.lineDashesOffset / Math.max (1.0f, width);
-                        dashes = new float[data.lineDashes.length * 2];
+                        float[] dashes_ = new float[data.lineDashes.length * 2];
                         for (int i = 0; i < data.lineDashes.length; i++) {
                             float dash = data.lineDashes[i] / Math.max (1.0f, width);
-                            dashes[i] = dash;
-                            dashes[i + data.lineDashes.length] = dash;
+                            dashes_[i] = dash;
+                            dashes_[i + data.lineDashes.length] = dash;
                         }
+                        dashes = dashes_;
                     }
                 }
                 default:
@@ -2443,7 +2444,7 @@
  *
  * @see #hashCode
  */
-public bool equals (Object object) {
+public override equals_t opEquals (Object object) {
     return (object is this) || (null !is (cast(GC)object) && (handle is (cast(GC)object).handle));
 }
 
@@ -2966,8 +2967,7 @@
     }
     int tch = ch;
     if (ch > 0x7F) {
-        char[1] str;
-        str[0] = ch;
+        TryImmutable!(char)[1] str = ch;
         StringT buffer = StrToTCHARs( str );
         tch = buffer[0];
     }
@@ -3112,8 +3112,7 @@
     static if (!OS.IsWinCE) {
         int tch = ch;
         if (ch > 0x7F) {
-            char[1] str;
-            str[0] = ch;
+            TryImmutable!(char)[1] str = ch;
             StringT buffer = StrToTCHARs( str );
             tch = buffer[0];
         }
@@ -3127,8 +3126,7 @@
     TEXTMETRIC lptm;
     OS.GetTextMetrics(handle, &lptm);
     SIZE size;
-    char[1] str;
-    str[0] = ch;
+    TryImmutable!(char)[1] str = ch;
     OS.GetTextExtentPoint32W(handle, StrToWCHARz( str ), 1, &size);
     return size.cx - lptm.tmOverhang;
 }