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

moving wxOSXCreateURLFromFileSystemPath to common OSX

Browse Source
This commit is contained in:
Stefan Csomor
2020-04-06 16:08:47 +02:00
parent 1dc0c777ae
commit eaec76ee97
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/filefn.cpp
View File

@@ -796,7 +796,16 @@ wxString wxPathOnly (const wxString& path)
// and back again - or we get nasty problems with delimiters.
// Also, convert to lower case, since case is significant in UNIX.
#if defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)
#ifdef __WXOSX__
CFURLRef wxOSXCreateURLFromFileSystemPath( const wxString& path)
{
wxCFRef<CFMutableStringRef> cfMutableString(CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(path)));
CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
return CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false);
}
#ifndef __WXOSX_IPHONE__
wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
{
@@ -842,13 +851,6 @@ wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )
return wxCFStringRef::AsStringWithNormalizationFormC(cfname);
}
CFURLRef wxOSXCreateURLFromFileSystemPath( const wxString& path)
{
wxCFRef<CFMutableStringRef> cfMutableString(CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(path)));
CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
return CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false);
}
#ifndef __LP64__
wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
@@ -871,6 +873,8 @@ void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
}
#endif
#endif // !__WXOSX_IPHONE__
#endif // __WXMAC__