Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using common code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-07-01 17:13:46 +00:00
parent 40aa05e0b8
commit 983aac2cdc
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/filefn.cpp
View File

@@ -849,12 +849,10 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
additionalPathComponent,false); additionalPathComponent,false);
CFRelease( parentURLRef ) ; CFRelease( parentURLRef ) ;
} }
CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle); wxCFStringRef cfString( CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle ));
CFRelease( fullURLRef ) ; CFRelease( fullURLRef ) ;
CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
CFRelease( cfString ); return wxCFStringRef::AsStringWithNormalizationFormC(cfString);
CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
return wxCFStringRef(cfMutableString).AsString();
} }
OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ) OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
@@ -879,13 +877,10 @@ OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ) wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )
{ {
CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault, wxCFStringRef cfname( CFStringCreateWithCharacters( kCFAllocatorDefault,
uniname->unicode, uniname->unicode,
uniname->length ); uniname->length ) );
CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname); return wxCFStringRef::AsStringWithNormalizationFormC(cfname);
CFRelease( cfname );
CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
return wxCFStringRef(cfMutableString).AsString() ;
} }
#ifndef __LP64__ #ifndef __LP64__