Merge: gamnit: miscellaneous services and a few fixes

[nit.git] / lib / cocoa / foundation.nit

diff --git a/lib/cocoa/foundation.nit b/lib/cocoa/foundation.nit
index 2996315..3a6fa98 100644 (file)
--- a/lib/cocoa/foundation.nit
+++ b/lib/cocoa/foundation.nit
@@ -37,7 +37,7 @@ extern class NSString in "ObjC" `{ NSString * `}
        # Get an UTF8 encoded `char*` copy of `self`
        fun utf8_string: NativeString in "ObjC" `{ return (char *)[self UTF8String]; `}
 
-       redef fun to_s do return utf8_string.to_s
+       redef fun to_s do return utf8_string.to_s_with_copy
 end
 
 redef class NativeString
@@ -45,13 +45,13 @@ redef class NativeString
        fun to_nsstring(length: Int): NSString in "ObjC" `{
                return [[NSString alloc] initWithBytes:self
                        length:length
-                       encoding:NSASCIIStringEncoding];
+                       encoding:NSUTF8StringEncoding];
        `}
 end
 
 redef class Text
        # Get a `NSString` from `self`
-       fun to_nsstring: NSString do return to_cstring.to_nsstring(length)
+       fun to_nsstring: NSString do return to_cstring.to_nsstring(bytelen)
 end
 
 # Wrapper of byte buffers
@@ -63,7 +63,7 @@ extern class NSData in "ObjC" `{ NSData * `}
        # Number of bytes containted in `self`
        fun length: Int in "ObjC" `{ return self.length; `}
 
-       redef fun to_s do return bytes.to_s_with_length(length)
+       redef fun to_s do return bytes.to_s_with_copy_and_length(length)
 end
 
 # Error condition