Mercurial > projects > dwt2
diff org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabItem.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 | fb3aa8075988 |
| children |
line wrap: on
line diff
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabItem.d Sun Apr 17 17:58:36 2011 +0200 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabItem.d Sat Jul 09 15:50:20 2011 +0300 @@ -32,14 +32,10 @@ import org.eclipse.swt.widgets.Widget; import org.eclipse.swt.custom.CTabFolder; - -version (Tango) +version(Tango){ import tango.text.convert.Utf; - -else -{ +} else { import std.conv; - alias to!(string) toString; alias to!(dstring) toString32; } @@ -227,7 +223,7 @@ x+9,y+2, x+7,y+4, x+7,y+5, x+9,y+7, x+9,y+9, x+7,y+9, x+5,y+7, x+4,y+7, x+2,y+9, x,y+9, x,y+7, x+2,y+5, x+2,y+4, x,y+2]; - Color fill = new Color(display, cast(RGB)CTabFolder.CLOSE_FILL); + Color fill = new Color(display, CTabFolder.CLOSE_FILL); gc.setBackground(fill); gc.fillPolygon(shape); fill.dispose(); @@ -240,7 +236,7 @@ x+10,y+3, x+8,y+5, x+8,y+6, x+10,y+8, x+10,y+10, x+8,y+10, x+6,y+8, x+5,y+8, x+3,y+10, x+1,y+10, x+1,y+8, x+3,y+6, x+3,y+5, x+1,y+3]; - Color fill = new Color(display, cast(RGB)CTabFolder.CLOSE_FILL); + Color fill = new Color(display, CTabFolder.CLOSE_FILL); gc.setBackground(fill); gc.fillPolygon(shape); fill.dispose(); @@ -299,8 +295,8 @@ // draw selected tab background and outline shape = null; if (this.parent.onBottom) { - int[] left = parent.simple ? CTabFolder.SIMPLE_BOTTOM_LEFT_CORNER : CTabFolder.BOTTOM_LEFT_CORNER; - int[] right = parent.simple ? cast(int[])CTabFolder.SIMPLE_BOTTOM_RIGHT_CORNER : parent.curve; + TryConst!(int)[] left = parent.simple ? CTabFolder.SIMPLE_BOTTOM_LEFT_CORNER : CTabFolder.BOTTOM_LEFT_CORNER; + TryConst!(int[]) right = parent.simple ? CTabFolder.SIMPLE_BOTTOM_RIGHT_CORNER : parent.curve; if (parent.borderLeft is 0 && parent.indexOf(this) is parent.firstIndex) { left = [x, y+height]; } @@ -323,8 +319,8 @@ shape[index++] = parent.simple ? rightEdge - 1 : rightEdge + parent.curveWidth - parent.curveIndent; shape[index++] = y - 1; } else { - int[] left = parent.simple ? CTabFolder.SIMPLE_TOP_LEFT_CORNER : CTabFolder.TOP_LEFT_CORNER; - int[] right = parent.simple ? cast(int[])CTabFolder.SIMPLE_TOP_RIGHT_CORNER : parent.curve; + TryConst!(int)[] left = parent.simple ? CTabFolder.SIMPLE_TOP_LEFT_CORNER : CTabFolder.TOP_LEFT_CORNER; + TryConst!(int[]) right = parent.simple ? CTabFolder.SIMPLE_TOP_RIGHT_CORNER : parent.curve; if (parent.borderLeft is 0 && parent.indexOf(this) is parent.firstIndex) { left = [x, y]; } @@ -486,7 +482,7 @@ rightEdge - parent.curveIndent, 1 + y); - int[] leftHighlightCurve = CTabFolder.TOP_LEFT_CORNER_HILITE; + const int[] leftHighlightCurve = CTabFolder.TOP_LEFT_CORNER_HILITE; int d = parent.tabHeight - parent.topCurveHighlightEnd.length /2; @@ -557,7 +553,7 @@ int startX = x + width - 1; if (this.parent.onBottom) { - int[] right = parent.simple + TryConst!(int[]) right = parent.simple ? CTabFolder.SIMPLE_UNSELECTED_INNER_CORNER : CTabFolder.BOTTOM_RIGHT_CORNER; @@ -571,7 +567,7 @@ shape[index++] = startX; shape[index++] = y - 1; } else { - int[] right = parent.simple + TryConst!(int[]) right = parent.simple ? CTabFolder.SIMPLE_UNSELECTED_INNER_CORNER : CTabFolder.TOP_RIGHT_CORNER; @@ -613,7 +609,7 @@ int[] shape = null; if (this.parent.onBottom) { - int[] left = parent.simple + TryConst!(int[]) left = parent.simple ? CTabFolder.SIMPLE_UNSELECTED_INNER_CORNER : CTabFolder.BOTTOM_LEFT_CORNER; @@ -626,7 +622,7 @@ shape[index++] = y + height + left[2 * i + 1] - 1; } } else { - int[] left = parent.simple + TryConst!(int[]) left = parent.simple ? CTabFolder.SIMPLE_UNSELECTED_INNER_CORNER : CTabFolder.TOP_LEFT_CORNER;