switch to cf implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c944775f72
commit
0aa6452b9d
@ -104,11 +104,7 @@ wxString wxStandardPathsCF::GetDocumentsDir() const
|
||||
#ifdef __WXMAC__
|
||||
return wxMacFindFolderNoSeparator
|
||||
(
|
||||
#if TARGET_API_MAC_OSX
|
||||
kUserDomain,
|
||||
#else
|
||||
kOnSystemDisk,
|
||||
#endif
|
||||
kDocumentsFolderType,
|
||||
kCreateFolder
|
||||
);
|
||||
@ -144,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
|
||||
|
Loading…
Reference in New Issue
Block a user