Mercurial > projects > dwt2
diff org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/DateTime.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/widgets/DateTime.d Sun Apr 17 17:58:36 2011 +0200 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/DateTime.d Sat Jul 09 15:50:20 2011 +0300 @@ -44,6 +44,7 @@ static import tango.time.chrono.Calendar; } else { // Phobos import std.conv; + static import std.datetime; } @@ -97,7 +98,13 @@ this.month = greg.getMonth( time ); this.year = greg.getYear( time ); } else { // Phobos - implMissing( __FILE__, __LINE__ ); + auto time = std.datetime.Clock.currTime(); + this.second = time.second; + this.minute = time.minute; + this.hour = time.hour; + this.dayofmonth = time.day; + this.month = time.month; + this.year = time.year; } } int getActualMaximum(int field){ @@ -299,7 +306,7 @@ private class DateFormatSymbols { private const String[] ampm = [ "AM"[], "PM" ]; - String[] getAmPmStrings(){ + TryConst!(String[]) getAmPmStrings(){ return ampm; } } @@ -565,8 +572,7 @@ String formattedStringValue(int fieldName, int value, bool adjust) { if (fieldName is Calendar.AM_PM) { - String[] ampm = formatSymbols.getAmPmStrings(); - return ampm[value]; + return formatSymbols.getAmPmStrings()[value]; } if (adjust) { if (fieldName is Calendar.HOUR && value is 0) { @@ -598,7 +604,7 @@ String getFormattedString(int style) { if ((style & SWT.TIME) !is 0) { - String[] ampm = formatSymbols.getAmPmStrings(); + auto ampm = formatSymbols.getAmPmStrings(); int h = calendar.get(Calendar.HOUR); if (h is 0) h = 12; int m = calendar.get(Calendar.MINUTE); int s = calendar.get(Calendar.SECOND); @@ -911,7 +917,7 @@ int length_ = end - start; String newText = event.text; if (fieldName is Calendar.AM_PM) { - String[] ampm = formatSymbols.getAmPmStrings(); + auto ampm = formatSymbols.getAmPmStrings(); if (newText.equalsIgnoreCase(ampm[Calendar.AM].substring(0, 1)) || newText.equalsIgnoreCase(ampm[Calendar.AM])) { setTextField(fieldName, Calendar.AM, true, false); } else if (newText.equalsIgnoreCase(ampm[Calendar.PM].substring(0, 1)) || newText.equalsIgnoreCase(ampm[Calendar.PM])) {