define wxHAS_ATOMIC_OPS only if native implementation is available; use fewer loop...

[wxWidgets.git] / include / wx / cocoa / string.h

diff --git a/include/wx/cocoa/string.h b/include/wx/cocoa/string.h
index be1067101d08cd84ab9df4f4f0ab0a9749951390..75e782dbe24920ac361ce1c5fdd3a7feb35e90fc 100644 (file)
--- a/include/wx/cocoa/string.h
+++ b/include/wx/cocoa/string.h
@@ -25,7 +25,7 @@
 inline NSString* wxNSStringWithWxString(const wxString &wxstring)
 {
 #if wxUSE_UNICODE
 inline NSString* wxNSStringWithWxString(const wxString &wxstring)
 {
 #if wxUSE_UNICODE

-    return [NSString stringWithUTF8String: wxstring.mb_str(wxConvUTF8)];
+    return [NSString stringWithUTF8String: wxstring.utf8_str()];

 #else
     return [NSString stringWithCString: wxstring.c_str() length:wxstring.Len()];
 #endif // wxUSE_UNICODE
 #else
     return [NSString stringWithCString: wxstring.c_str() length:wxstring.Len()];
 #endif // wxUSE_UNICODE


@@ -35,7 +35,7 @@ inline NSString* wxNSStringWithWxString(const wxString &wxstring)
 inline NSString* wxInitNSStringWithWxString(NSString *nsstring, const wxString &wxstring)
 {
 #if wxUSE_UNICODE
 inline NSString* wxInitNSStringWithWxString(NSString *nsstring, const wxString &wxstring)
 {
 #if wxUSE_UNICODE

-    return [nsstring initWithUTF8String: wxstring.mb_str(wxConvUTF8)];
+    return [nsstring initWithUTF8String: wxstring.utf8_str()];

 #else
     return [nsstring initWithCString: wxstring.c_str() length:wxstring.Len()];
 #endif // wxUSE_UNICODE
 #else
     return [nsstring initWithCString: wxstring.c_str() length:wxstring.Len()];
 #endif // wxUSE_UNICODE


@@ -44,7 +44,7 @@ inline NSString* wxInitNSStringWithWxString(NSString *nsstring, const wxString &
 inline wxString wxStringWithNSString(NSString *nsstring)
 {
 #if wxUSE_UNICODE
 inline wxString wxStringWithNSString(NSString *nsstring)
 {
 #if wxUSE_UNICODE

-    return wxString([nsstring UTF8String], wxConvUTF8);
+    return wxString::FromUTF8([nsstring UTF8String]);

 #else
     return wxString([nsstring lossyCString]);
 #endif // wxUSE_UNICODE
 #else
     return wxString([nsstring lossyCString]);
 #endif // wxUSE_UNICODE