comparison com.ibm.icu/src/com/ibm/icu/mangoicu/UText.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
comparison
equal deleted inserted replaced
119:d00e8db0a568 120:536e43f63c81
147 complicated by the issues regarding D and DLLs on the 147 complicated by the issues regarding D and DLLs on the
148 Windows platform 148 Windows platform
149 149
150 ***********************************************************************/ 150 ***********************************************************************/
151 151
152 private static void* library; 152 /*extern(System)*/
153 153 mixin(genICUNative!("uc"
154 /*********************************************************************** 154 ,"UText * function(UText* ut)", "utext_close"
155 155 ,"UText * function(UText* ut, char *s, long length, ref ICU.UErrorCode status)", "utext_openUTF8"
156 ***********************************************************************/ 156 /+
157 static extern(System){ 157 ,"UText * function(UText* ut, UChar *s, int64_t length, ref UErrorCode status)", "utext_openUChars"
158 UText * function(UText* ut) utext_close; 158 ,"UText * function(UText* ut, U_NAMESPACE_QUALIFIER UnicodeString *s, ref UErrorCode status)", "utext_openUnicodeString"
159 UText * function(UText* ut, char *s, long length, inout ICU.UErrorCode status) utext_openUTF8; 159 ,"UText * function(UText* ut, U_NAMESPACE_QUALIFIER UnicodeString *s, ref UErrorCode status)", "utext_openConstUnicodeString"
160 // UText * function(UText* ut, UChar *s, int64_t length, inout UErrorCode status) utext_openUChars; 160 ,"UText * function(UText* ut, U_NAMESPACE_QUALIFIER Replaceable *rep, ref UErrorCode status)", "utext_openReplaceable"
161 // UText * function(UText* ut, U_NAMESPACE_QUALIFIER UnicodeString *s, inout UErrorCode status) utext_openUnicodeString; 161 ,"UText * function(UText* ut, U_NAMESPACE_QUALIFIER CharacterIterator *ic, ref UErrorCode status)", "utext_openCharacterIterator"
162 // UText * function(UText* ut, U_NAMESPACE_QUALIFIER UnicodeString *s, inout UErrorCode status) utext_openConstUnicodeString; 162 ,"UText * function(UText* ut, UText *src, UBool deep, UBool readOnly, ref UErrorCode status)", "utext_clone"
163 // UText * function(UText* ut, U_NAMESPACE_QUALIFIER Replaceable *rep, inout UErrorCode status) utext_openReplaceable; 163 ,"UBool function(const UText *a, const UText *b)", "utext_equals"
164 // UText * function(UText* ut, U_NAMESPACE_QUALIFIER CharacterIterator *ic, inout UErrorCode status) utext_openCharacterIterator; 164 ,"int64_t function(UText* ut)", "utext_nativeLength"
165 // UText * function(UText* ut, UText *src, UBool deep, UBool readOnly, inout UErrorCode status) utext_clone; 165 ,"UBool function(UText* ut)", "utext_isLengthExpensive"
166 // UBool function(const UText *a, const UText *b) utext_equals; 166 ,"UChar32 function(UText* ut, int64_t nativeIndex)", "utext_char32At"
167 // int64_t function(UText* ut) utext_nativeLength; 167 ,"UChar32 function(UText* ut)", "utext_current32"
168 // UBool function(UText* ut) utext_isLengthExpensive; 168 ,"UChar32 function(UText* ut)", "utext_next32"
169 // UChar32 function(UText* ut, int64_t nativeIndex) utext_char32At; 169 ,"UChar32 function(UText* ut)", "utext_previous32"
170 // UChar32 function(UText* ut) utext_current32; 170 ,"UChar32 function(UText* ut, int64_t nativeIndex)", "utext_next32From"
171 // UChar32 function(UText* ut) utext_next32; 171 ,"UChar32 function(UText* ut, int64_t nativeIndex)", "utext_previous32From"
172 // UChar32 function(UText* ut) utext_previous32; 172 ,"int64_t function(UText* ut)", "utext_getNativeIndex"
173 // UChar32 function(UText* ut, int64_t nativeIndex) utext_next32From; 173 ,"void function(UText* ut, int64_t nativeIndex)", "utext_setNativeIndex"
174 // UChar32 function(UText* ut, int64_t nativeIndex) utext_previous32From; 174 ,"UBool function(UText* ut, int delta)", "utext_moveIndex32"
175 // int64_t function(UText* ut) utext_getNativeIndex; 175 ,"int64_t function(UText* ut)", "utext_getPreviousNativeIndex"
176 // void function(UText* ut, int64_t nativeIndex) utext_setNativeIndex; 176 ,"int function(UText* ut, int64_t nativeStart, int64_t nativeLimit, UChar *dest, int destCapacity, ref UErrorCode status)", "utext_extract"
177 // UBool function(UText* ut, int delta) utext_moveIndex32; 177 ,"UBool function(UText* ut)", "utext_isWritable"
178 // int64_t function(UText* ut) utext_getPreviousNativeIndex; 178 ,"UBool function(UText* ut)", "utext_hasMetaData"
179 // int function(UText* ut, int64_t nativeStart, int64_t nativeLimit, 179 ,"int function(UText* ut, int64_t nativeStart, int64_t nativeLimit, UChar *replacementText, int replacementLength, ref UErrorCode status)", "utext_replace"
180 // UChar *dest, int destCapacity, 180 ,"void function(UText* ut, int64_t nativeStart, int64_t nativeLimit, int64_t destIndex, UBool move, ref UErrorCode status)", "utext_copy"
181 // inout UErrorCode status) utext_extract; 181 ,"void function(UText* ut)", "utext_freeze"
182 // UBool function(UText* ut) utext_isWritable; 182 ,"UText * function(UText* ut, int extraSpace, ref UErrorCode status)", "utext_setup"
183 // UBool function(UText* ut) utext_hasMetaData; 183 +/
184 // int function(UText* ut, 184 ));
185 // int64_t nativeStart, int64_t nativeLimit,
186 // UChar *replacementText, int replacementLength,
187 // inout UErrorCode status) utext_replace;
188 // void function(UText* ut,
189 // int64_t nativeStart, int64_t nativeLimit,
190 // int64_t destIndex,
191 // UBool move,
192 // inout UErrorCode status) utext_copy;
193 // void function(UText* ut) utext_freeze;
194 // UText * function(UText* ut, int extraSpace, inout UErrorCode status) utext_setup;
195 }
196
197 /***********************************************************************
198
199 ***********************************************************************/
200 static FunctionLoader.Bind[] targets = [
201 {cast(void**) &utext_close, "utext_close"},
202 {cast(void**) &utext_openUTF8, "utext_openUTF8"},
203 // {cast(void**) &utext_openUChars, "utext_openUChars"},
204 // {cast(void**) &utext_openUnicodeString, "utext_openUnicodeString"},
205 // {cast(void**) &utext_openConstUnicodeString, "utext_openConstUnicodeString"},
206 // {cast(void**) &utext_openReplaceable, "utext_openReplaceable"},
207 // {cast(void**) &utext_openCharacterIterator, "utext_openCharacterIterator"},
208 // {cast(void**) &utext_clone, "utext_clone"},
209 // {cast(void**) &utext_equals, "utext_equals"},
210 // {cast(void**) &utext_nativeLength, "utext_nativeLength"},
211 // {cast(void**) &utext_isLengthExpensive, "utext_isLengthExpensive"},
212 // {cast(void**) &utext_char32At, "utext_char32At"},
213 // {cast(void**) &utext_current32, "utext_current32"},
214 // {cast(void**) &utext_next32, "utext_next32"},
215 // {cast(void**) &utext_next32From, "utext_next32From"},
216 // {cast(void**) &utext_previous32, "utext_previous32"},
217 // {cast(void**) &utext_previous32From, "utext_previous32From"},
218 // {cast(void**) &utext_setNativeIndex, "utext_setNativeIndex"},
219 // {cast(void**) &utext_moveIndex32, "utext_moveIndex32"},
220 // {cast(void**) &utext_getPreviousNativeIndex, "utext_getPreviousNativeIndex"},
221 // {cast(void**) &utext_extract, "utext_extract"},
222 // {cast(void**) &utext_isWritable, "utext_isWritable"},
223 // {cast(void**) &utext_hasMetaData, "utext_hasMetaData"},
224 // {cast(void**) &utext_replace, "utext_replace"},
225 // {cast(void**) &utext_copy, "utext_copy"},
226 // {cast(void**) &utext_freeze, "utext_freeze"},
227 // {cast(void**) &utext_setup, "utext_setup"},
228 ];
229
230 /***********************************************************************
231
232 ***********************************************************************/
233
234 static this ()
235 {
236 library = FunctionLoader.bind (ICU.icuuc, targets);
237 //test ();
238 }
239
240 /***********************************************************************
241
242 ***********************************************************************/
243
244 static ~this ()
245 {
246 FunctionLoader.unbind (library);
247 }
248
249 } 185 }