Mercurial > projects > dwt2
diff com.ibm.icu/src/com/ibm/icu/mangoicu/UTimeZone.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 | ebefa5c2eab4 |
| children |
line wrap: on
line diff
--- a/com.ibm.icu/src/com/ibm/icu/mangoicu/UTimeZone.d Sun Apr 17 17:58:36 2011 +0200 +++ b/com.ibm.icu/src/com/ibm/icu/mangoicu/UTimeZone.d Sat Jul 09 15:50:20 2011 +0300 @@ -99,7 +99,7 @@ struct UTimeZone { - public CString16 name; + public String16 name; public static UTimeZone Default = {null}; public static UTimeZone Gmt = {"Etc/GMT"}; @@ -142,16 +142,16 @@ ***********************************************************************/ - static void getDefault (inout UTimeZone zone) + static void getDefault (ref UTimeZone zone) { - uint format (wchar* dst, uint length, inout ICU.UErrorCode e) + uint format (wchar* dst, uint length, ref ICU.UErrorCode e) { return ucal_getDefaultTimeZone (dst, length, e); } UString s = new UString(64); s.format (&format, "failed to get default time zone"); - zone.name = s.get(); + zone.name = cast(String16) s.get(); } /*********************************************************************** @@ -160,7 +160,7 @@ ***********************************************************************/ - static void setDefault (inout UTimeZone zone) + static void setDefault (ref UTimeZone zone) { ICU.UErrorCode e; @@ -177,7 +177,7 @@ ***********************************************************************/ - static uint getDSTSavings (inout UTimeZone zone) + static uint getDSTSavings (ref UTimeZone zone) { ICU.UErrorCode e; @@ -193,7 +193,7 @@ **********************************************************************/ - static int opApply (int delegate(inout wchar[] element) dg) + static int opApply (int delegate(ref wchar[] element) dg) { ICU.UErrorCode e; wchar[] name; @@ -218,47 +218,10 @@ ***********************************************************************/ - private static void* library; - - /*********************************************************************** - - ***********************************************************************/ - - private static extern (C) - { - void* function (inout ICU.UErrorCode) ucal_openTimeZones; - uint function (wchar*, uint, inout ICU.UErrorCode) ucal_getDefaultTimeZone; - void function (wchar*, inout ICU.UErrorCode) ucal_setDefaultTimeZone; - uint function (wchar*, inout ICU.UErrorCode) ucal_getDSTSavings; - } - - /*********************************************************************** - - ***********************************************************************/ - - static FunctionLoader.Bind[] targets = - [ - {cast(void**) &ucal_openTimeZones, "ucal_openTimeZones"}, - {cast(void**) &ucal_getDefaultTimeZone, "ucal_getDefaultTimeZone"}, - {cast(void**) &ucal_setDefaultTimeZone, "ucal_setDefaultTimeZone"}, - {cast(void**) &ucal_getDSTSavings, "ucal_getDSTSavings"}, - ]; - - /*********************************************************************** - - ***********************************************************************/ - - static this () - { - library = FunctionLoader.bind (ICU.icuin, targets); - } - - /*********************************************************************** - - ***********************************************************************/ - - static ~this () - { - FunctionLoader.unbind (library); - } + mixin(/*ICU.*/genICUNative!("in" + ,"void* function (ref ICU.UErrorCode)", "ucal_openTimeZones" + ,"uint function (wchar*, uint, ref ICU.UErrorCode)", "ucal_getDefaultTimeZone" + ,"void function (wchar*, ref ICU.UErrorCode)", "ucal_setDefaultTimeZone" + ,"uint function (wchar*, ref ICU.UErrorCode)", "ucal_getDSTSavings" + )); }