Mercurial > projects > dwt2

diff org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Compatibility.d @ 120:536e43f63c81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 70388b0e6dad
children
line wrap: on
line diff
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Compatibility.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Compatibility.d	Sat Jul 09 15:50:20 2011 +0300
@@ -117,8 +117,9 @@
  * @param child the file's name
  * @return true if the file exists
  */
-public static bool fileExists(CString parent, CString child) {
-    return (new File (parent, child)).exists();
+public static bool fileExists(String parent, String child) {
+    scope f = new File(parent, child);
+    return f.exists();
 }
 
 /**
@@ -192,8 +193,8 @@
  * @return a stream on the file if it could be opened.
  * @exception IOException
  */
-public static InputStream newFileInputStream(CString filename) {
-    return new FileInputStream(filename._idup());
+public static InputStream newFileInputStream(String filename) {
+    return new FileInputStream(filename);
 }
 
 /**
@@ -203,8 +204,8 @@
  * @return a stream on the file if it could be opened.
  * @exception IOException
  */
-public static OutputStream newFileOutputStream(CString filename) {
-    return new FileOutputStream(filename._idup());
+public static OutputStream newFileOutputStream(String filename) {
+    return new FileOutputStream(filename);
 }
 
 /**
@@ -272,12 +273,12 @@
  * @exception ProcessException
  *  if the program cannot be executed
  */
-public static void exec(CString prog) {
+public static void exec(String prog) {
     version(Tango){
         auto proc = new Process( prog );
         proc.execute;
     } else { // Phobos
-        implMissing( __FILE__, __LINE__ );
+        implMissingInPhobos();
     }
 }
 
@@ -293,12 +294,12 @@
  * @exception ProcessException
  *  if the program cannot be executed
  */
-public static void exec(CString[] progArray) {
+public static void exec(String[] progArray) {
     version(Tango){
         auto proc = new Process( progArray );
         proc.execute;
     } else { // Phobos
-        implMissing( __FILE__, __LINE__ );
+        implMissingInPhobos();
     }
 }
 
@@ -341,8 +342,8 @@
  *
  * @see SWT#getMessage(String)
  */
-public static String getMessage(CString key) {
-    String answer = key._idup();
+public static String getMessage(String key) {
+    String answer = key;
 
     if (key is null) {
         SWT.error (SWT.ERROR_NULL_ARGUMENT);
@@ -351,7 +352,7 @@
         try {
             msgs = ResourceBundle.getBundle(SWTMessagesBundleData); //$NON-NLS-1$
         } catch (MissingResourceException ex) {
-            answer = cast(String)(key ~ " (no resource bundle)"); //$NON-NLS-1$
+            answer = key ~ " (no resource bundle)"; //$NON-NLS-1$
         }
     }
     if (msgs !is null) {
@@ -362,8 +363,8 @@
     return answer;
 }
 
-public static String getMessage(CString key, Object[] args) {
-    String answer = key._idup();
+public static String getMessage(String key, Object[] args) {
+    String answer = key;
 
     if (key is null || args is null) {
         SWT.error (SWT.ERROR_NULL_ARGUMENT);
@@ -372,7 +373,7 @@
         try {
             msgs = ResourceBundle.getBundle(SWTMessagesBundleData); //$NON-NLS-1$
         } catch (MissingResourceException ex) {
-            answer = cast(String)(key ~ " (no resource bundle)"); //$NON-NLS-1$
+            answer = key ~ " (no resource bundle)"; //$NON-NLS-1$
         }
     }
     if (msgs !is null) {
@@ -413,20 +414,8 @@
  * @param s2 string
  * @return true if the two instances of class String are equal
  */
-public static bool equalsIgnoreCase(CString s1, CString s2) {
-    version(Tango){
-        String s1b = new char[ s1.length ];
-        String s2b = new char[ s1.length ];
-        scope(exit){
-            delete s1b;
-            delete s2b;
-        }
-        String s1c = Unicode.toFold( s1, s1b );
-        String s2c = Unicode.toFold( s2, s2b );
-        return s1c == s2c;
-    } else { // Phobos
-        return std.string.icmp( s1, s2 ) is 0;
-    }
+public static bool equalsIgnoreCase(in char[] s1, in char[] s2) {
+    return .equalsIgnoreCase(s1, s2);
 }
 
 }