Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/cocoa/string.h b/include/wx/cocoa/string.h
index a7e714282ff64996f88937bc4ebc1cb2032940fd..e578e0381e85e0837d1fb22b2316c886cba4479a 100644 (file)
--- a/include/wx/cocoa/string.h
+++ b/include/wx/cocoa/string.h
@@ -6,7 +6,7 @@
 // Created:     2003/04/13
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/04/13
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STRING_H__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __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::FromUTF8Unchecked([nsstring UTF8String]);

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