Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / osx / core / cfstring.h

diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h
index e60bb91548338acb492a545476f0e95a957b68c2..addef26fd75aaf8644ac72d5572cbebe1636bba0 100644 (file)
--- a/include/wx/osx/core/cfstring.h
+++ b/include/wx/osx/core/cfstring.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/corefoundation/cfstring.h
+// Name:        wx/osx/core/cfstring.h

 // Purpose:     wxCFStringRef and other string functions
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxCFStringRef and other string functions
 // Author:      Stefan Csomor
 // Modified by:


@@ -49,18 +49,18 @@ public:
 
 #if wxOSX_USE_COCOA_OR_IPHONE
     wxCFStringRef(NSString* ref)
 
 #if wxOSX_USE_COCOA_OR_IPHONE
     wxCFStringRef(NSString* ref)

-        : wxCFRef< CFStringRef >((CFStringRef) ref) 
+        : wxCFRef< CFStringRef >((CFStringRef) ref)

     {
     }
 #endif
 
     wxCFStringRef(CFStringRef ref)
     {
     }
 #endif
 
     wxCFStringRef(CFStringRef ref)

-        : wxCFRef< CFStringRef >(ref) 
+        : wxCFRef< CFStringRef >(ref)

     {
     }
 
     wxCFStringRef(const wxCFStringRef& otherRef )
     {
     }
 
     wxCFStringRef(const wxCFStringRef& otherRef )

-        : wxCFRef< CFStringRef >(otherRef) 
+        : wxCFRef< CFStringRef >(otherRef)

     {
     }
 
     {
     }
 


@@ -69,10 +69,12 @@ public:
     }
 
     wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const;
     }
 
     wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const;

-    
+

     static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
     static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;

+    static wxString AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;

 #if wxOSX_USE_COCOA_OR_IPHONE
     static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
 #if wxOSX_USE_COCOA_OR_IPHONE
     static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;

+    static wxString AsStringWithNormalizationFormC( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;

 #endif
 
 #if wxOSX_USE_COCOA_OR_IPHONE
 #endif
 
 #if wxOSX_USE_COCOA_OR_IPHONE