diff org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FormLayout.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 c01d033c633a
children
line wrap: on
line diff
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FormLayout.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FormLayout.d	Sat Jul 09 15:50:20 2011 +0300
@@ -23,11 +23,6 @@
 import org.eclipse.swt.widgets.Scrollable;
 
 import java.lang.all;
-version(Tango){
-    import tango.util.Convert;
-} else { // Phobos
-    import std.conv;
-}
 
 /**
  * Instances of this class control the position and size of the
@@ -386,13 +381,13 @@
  */
 override public String toString () {
     String string =  getName ()~" {";
-    if (marginWidth !is 0) string ~= "marginWidth="~to!(String)(marginWidth)~" ";
-    if (marginHeight !is 0) string ~= "marginHeight="~to!(String)(marginHeight)~" ";
-    if (marginLeft !is 0) string ~= "marginLeft="~to!(String)(marginLeft)~" ";
-    if (marginRight !is 0) string ~= "marginRight="~to!(String)(marginRight)~" ";
-    if (marginTop !is 0) string ~= "marginTop="~to!(String)(marginTop)~" ";
-    if (marginBottom !is 0) string ~= "marginBottom="~to!(String)(marginBottom)~" ";
-    if (spacing !is 0) string ~= "spacing="~to!(String)(spacing)~" ";
+    if (marginWidth !is 0) string ~= "marginWidth="~String_valueOf(marginWidth)~" ";
+    if (marginHeight !is 0) string ~= "marginHeight="~String_valueOf(marginHeight)~" ";
+    if (marginLeft !is 0) string ~= "marginLeft="~String_valueOf(marginLeft)~" ";
+    if (marginRight !is 0) string ~= "marginRight="~String_valueOf(marginRight)~" ";
+    if (marginTop !is 0) string ~= "marginTop="~String_valueOf(marginTop)~" ";
+    if (marginBottom !is 0) string ~= "marginBottom="~String_valueOf(marginBottom)~" ";
+    if (spacing !is 0) string ~= "spacing="~String_valueOf(spacing)~" ";
     string = string.trim();
     string ~= "}";
     return string;