X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b71ebada49b82fd7172f392fc9fb14e3556a38c..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/mac/corefoundation/stdpaths_cf.cpp diff --git a/src/mac/corefoundation/stdpaths_cf.cpp b/src/mac/corefoundation/stdpaths_cf.cpp index fedc3982f0..5d93769869 100644 --- a/src/mac/corefoundation/stdpaths_cf.cpp +++ b/src/mac/corefoundation/stdpaths_cf.cpp @@ -32,19 +32,10 @@ #endif #include "wx/mac/corefoundation/cfstring.h" -#if defined(__DARWIN__) #include #include -#else -#include -#include -#endif -#if defined(__WXCOCOA__) || defined(__WXMAC_OSX__) #define kDefaultPathStyle kCFURLPOSIXPathStyle -#else -#define kDefaultPathStyle kCFURLHFSPathStyle -#endif // ============================================================================ // implementation @@ -58,12 +49,14 @@ wxStandardPathsCF::wxStandardPathsCF() : m_bundle(CFBundleGetMainBundle()) { CFRetain(m_bundle); + UseAppInfo(AppInfo_AppName | AppInfo_VendorName); } wxStandardPathsCF::wxStandardPathsCF(wxCFBundleRef bundle) : m_bundle(bundle) { CFRetain(m_bundle); + UseAppInfo(AppInfo_AppName | AppInfo_VendorName); } wxStandardPathsCF::~wxStandardPathsCF() @@ -92,7 +85,7 @@ static wxString BundleRelativeURLToPath(CFURLRef relativeURL) wxCHECK_MSG(absoluteURL, wxEmptyString, wxT("Failed to resolve relative URL to absolute URL")); CFStringRef cfStrPath = CFURLCopyFileSystemPath(absoluteURL,kDefaultPathStyle); CFRelease(absoluteURL); - return wxMacCFStringHolder(cfStrPath).AsString(wxLocale::GetSystemEncoding()); + return wxCFStringRef(cfStrPath).AsString(wxLocale::GetSystemEncoding()); } wxString wxStandardPathsCF::GetFromFunc(wxCFURLRef (*func)(wxCFBundleRef)) const @@ -111,11 +104,7 @@ wxString wxStandardPathsCF::GetDocumentsDir() const #ifdef __WXMAC__ return wxMacFindFolderNoSeparator ( -#if TARGET_API_MAC_OSX kUserDomain, -#else - kOnSystemDisk, -#endif kDocumentsFolderType, kCreateFolder ); @@ -151,26 +140,39 @@ wxString wxStandardPathsCF::GetDataDir() const return GetFromFunc(CFBundleCopySharedSupportURL); } -// TODO: implement this using real CoreFoundation API instead of Carbon API wxString wxStandardPathsCF::GetExecutablePath() const { #ifdef __WXMAC__ +#if 1 + return GetFromFunc(CFBundleCopyBundleURL); +#else + // TODO remove if cf implementation ok ProcessInfoRec processinfo; ProcessSerialNumber procno ; +#ifdef __LP64__ + FSRef fsRef; +#else FSSpec fsSpec; - +#endif + procno.highLongOfPSN = 0 ; procno.lowLongOfPSN = kCurrentProcess ; processinfo.processInfoLength = sizeof(ProcessInfoRec); processinfo.processName = NULL; +#ifdef __LP64__ + processinfo.processAppRef = &fsRef; +#else processinfo.processAppSpec = &fsSpec; - +#endif + GetProcessInformation( &procno , &processinfo ) ; #ifdef __LP64__ return wxMacFSRefToPath(&fsRef); #else return wxMacFSSpec2MacFilename(&fsSpec); #endif +#endif + #else return wxStandardPathsBase::GetExecutablePath(); #endif @@ -179,18 +181,18 @@ wxString wxStandardPathsCF::GetExecutablePath() const wxString wxStandardPathsCF::GetLocalDataDir() const { #ifdef __WXMAC__ - return AppendAppName(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder)); + return AppendAppInfo(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder)); #else - return AppendAppName(wxT("/Library/Application Support")); + return AppendAppInfo(wxT("/Library/Application Support")); #endif } wxString wxStandardPathsCF::GetUserDataDir() const { #ifdef __WXMAC__ - return AppendAppName(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder)); + return AppendAppInfo(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder)); #else - return AppendAppName(wxFileName::GetHomeDir() + _T("/Library/Application Support")); + return AppendAppInfo(wxFileName::GetHomeDir() + _T("/Library/Application Support")); #endif }