Mercurial > projects > dwt2
comparison org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/GridLayout.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 |
comparison
equal
deleted
inserted
replaced
119:d00e8db0a568 | 120:536e43f63c81 |
---|---|
19 import org.eclipse.swt.widgets.Control; | 19 import org.eclipse.swt.widgets.Control; |
20 import org.eclipse.swt.widgets.Composite; | 20 import org.eclipse.swt.widgets.Composite; |
21 import org.eclipse.swt.widgets.Layout; | 21 import org.eclipse.swt.widgets.Layout; |
22 import org.eclipse.swt.widgets.Scrollable; | 22 import org.eclipse.swt.widgets.Scrollable; |
23 | 23 |
24 import java.lang.System; | |
24 | 25 |
25 import java.lang.all; | 26 import java.lang.all; |
26 version(Tango){ | |
27 import tango.util.Convert; | |
28 } else { // Phobos | |
29 import std.conv; | |
30 } | |
31 | 27 |
32 | 28 |
33 /** | 29 /** |
34 * Instances of this class lay out the control children of a | 30 * Instances of this class lay out the control children of a |
35 * <code>Composite</code> in a grid. | 31 * <code>Composite</code> in a grid. |
744 * | 740 * |
745 * @return a string representation of the layout | 741 * @return a string representation of the layout |
746 */ | 742 */ |
747 override public String toString () { | 743 override public String toString () { |
748 String string = getName ()~" {"; | 744 String string = getName ()~" {"; |
749 if (numColumns !is 1) string ~= "numColumns="~to!(String)(numColumns)~" "; | 745 if (numColumns !is 1) string ~= "numColumns="~String_valueOf(numColumns)~" "; |
750 if (makeColumnsEqualWidth) string ~= "makeColumnsEqualWidth="~to!(String)(makeColumnsEqualWidth)~" "; | 746 if (makeColumnsEqualWidth) string ~= "makeColumnsEqualWidth="~String_valueOf(makeColumnsEqualWidth)~" "; |
751 if (marginWidth !is 0) string ~= "marginWidth="~to!(String)(marginWidth)~" "; | 747 if (marginWidth !is 0) string ~= "marginWidth="~String_valueOf(marginWidth)~" "; |
752 if (marginHeight !is 0) string ~= "marginHeight="~to!(String)(marginHeight)~" "; | 748 if (marginHeight !is 0) string ~= "marginHeight="~String_valueOf(marginHeight)~" "; |
753 if (marginLeft !is 0) string ~= "marginLeft="~to!(String)(marginLeft)~" "; | 749 if (marginLeft !is 0) string ~= "marginLeft="~String_valueOf(marginLeft)~" "; |
754 if (marginRight !is 0) string ~= "marginRight="~to!(String)(marginRight)~" "; | 750 if (marginRight !is 0) string ~= "marginRight="~String_valueOf(marginRight)~" "; |
755 if (marginTop !is 0) string ~= "marginTop="~to!(String)(marginTop)~" "; | 751 if (marginTop !is 0) string ~= "marginTop="~String_valueOf(marginTop)~" "; |
756 if (marginBottom !is 0) string ~= "marginBottom="~to!(String)(marginBottom)~" "; | 752 if (marginBottom !is 0) string ~= "marginBottom="~String_valueOf(marginBottom)~" "; |
757 if (horizontalSpacing !is 0) string ~= "horizontalSpacing="~to!(String)(horizontalSpacing)~" "; | 753 if (horizontalSpacing !is 0) string ~= "horizontalSpacing="~String_valueOf(horizontalSpacing)~" "; |
758 if (verticalSpacing !is 0) string ~= "verticalSpacing="~to!(String)(verticalSpacing)~" "; | 754 if (verticalSpacing !is 0) string ~= "verticalSpacing="~String_valueOf(verticalSpacing)~" "; |
759 string = string.trim(); | 755 string = string.trim(); |
760 string ~= "}"; | 756 string ~= "}"; |
761 return string; | 757 return string; |
762 } | 758 } |
763 } | 759 } |