Mercurial > projects > dwt2
diff org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/GridData.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/GridData.d Sun Apr 17 17:58:36 2011 +0200 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/GridData.d Sat Jul 09 15:50:20 2011 +0300 @@ -17,11 +17,6 @@ import org.eclipse.swt.widgets.Control; import java.lang.all; -version(Tango){ - import tango.util.Convert; -} else { // Phobos - import std.conv; -} /** * <code>GridData</code> is the layout data object associated with @@ -536,7 +531,7 @@ case SWT.RIGHT: hAlign = "SWT.RIGHT"; break; case SWT.CENTER: hAlign = "SWT.CENTER"; break; case CENTER: hAlign = "GridData.CENTER"; break; - default: hAlign = "Undefined "~to!(String)(horizontalAlignment); break; + default: hAlign = "Undefined "~String_valueOf(horizontalAlignment); break; } String vAlign = ""; switch (verticalAlignment) { @@ -548,22 +543,22 @@ case SWT.BOTTOM: vAlign = "SWT.BOTTOM"; break; case SWT.CENTER: vAlign = "SWT.CENTER"; break; case CENTER: vAlign = "GridData.CENTER"; break; - default: vAlign = "Undefined "~to!(String)(verticalAlignment); break; + default: vAlign = "Undefined "~String_valueOf(verticalAlignment); break; } String string = getName()~" {"; - string ~= "horizontalAlignment="~to!(String)(hAlign)~" "; - if (horizontalIndent !is 0) string ~= "horizontalIndent="~to!(String)(horizontalIndent)~" "; - if (horizontalSpan !is 1) string ~= "horizontalSpan="~to!(String)(horizontalSpan)~" "; - if (grabExcessHorizontalSpace) string ~= "grabExcessHorizontalSpace="~to!(String)(grabExcessHorizontalSpace)~" "; - if (widthHint !is SWT.DEFAULT) string ~= "widthHint="~to!(String)(widthHint)~" "; - if (minimumWidth !is 0) string ~= "minimumWidth="~to!(String)(minimumWidth)~" "; + string ~= "horizontalAlignment="~hAlign~" "; + if (horizontalIndent !is 0) string ~= "horizontalIndent="~String_valueOf(horizontalIndent)~" "; + if (horizontalSpan !is 1) string ~= "horizontalSpan="~String_valueOf(horizontalSpan)~" "; + if (grabExcessHorizontalSpace) string ~= "grabExcessHorizontalSpace="~String_valueOf(grabExcessHorizontalSpace)~" "; + if (widthHint !is SWT.DEFAULT) string ~= "widthHint="~String_valueOf(widthHint)~" "; + if (minimumWidth !is 0) string ~= "minimumWidth="~String_valueOf(minimumWidth)~" "; string ~= "verticalAlignment="~vAlign~" "; - if (verticalIndent !is 0) string ~= "verticalIndent="~to!(String)(verticalIndent)~" "; - if (verticalSpan !is 1) string ~= "verticalSpan="~to!(String)(verticalSpan)~" "; - if (grabExcessVerticalSpace) string ~= "grabExcessVerticalSpace="~to!(String)(grabExcessVerticalSpace)~" "; - if (heightHint !is SWT.DEFAULT) string ~= "heightHint="~to!(String)(heightHint)~" "; - if (minimumHeight !is 0) string ~= "minimumHeight="~to!(String)(minimumHeight)~" "; - if (exclude) string ~= "exclude="~to!(String)(exclude)~" "; + if (verticalIndent !is 0) string ~= "verticalIndent="~String_valueOf(verticalIndent)~" "; + if (verticalSpan !is 1) string ~= "verticalSpan="~String_valueOf(verticalSpan)~" "; + if (grabExcessVerticalSpace) string ~= "grabExcessVerticalSpace="~String_valueOf(grabExcessVerticalSpace)~" "; + if (heightHint !is SWT.DEFAULT) string ~= "heightHint="~String_valueOf(heightHint)~" "; + if (minimumHeight !is 0) string ~= "minimumHeight="~String_valueOf(minimumHeight)~" "; + if (exclude) string ~= "exclude="~String_valueOf(exclude)~" "; string = string.trim(); string ~= "}"; return string;