X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/072a99f4317f38813934e1f25ea926334a702540..0286d08d1453506f9ff9a830d58b3b35817d0b14:/src/mac/corefoundation/stdpaths_cf.cpp diff --git a/src/mac/corefoundation/stdpaths_cf.cpp b/src/mac/corefoundation/stdpaths_cf.cpp index 24caa0ff76..f8cf48355a 100644 --- a/src/mac/corefoundation/stdpaths_cf.cpp +++ b/src/mac/corefoundation/stdpaths_cf.cpp @@ -9,13 +9,27 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #include "wx/wxprec.h" + +#if wxUSE_STDPATHS + #ifndef WX_PRECOMP #include "wx/intl.h" #endif //ndef WX_PRECOMP #include "wx/stdpaths.h" #include "wx/filename.h" +#ifdef __WXMAC__ +#include "wx/mac/private.h" +#endif #include "wx/mac/corefoundation/cfstring.h" #if defined(__DARWIN__) @@ -26,96 +40,172 @@ #include #endif -// See comment in include/wx/mac/corefoundation/stdpaths.h -#ifndef wxStandardPaths -#warning "wxStandardPaths should be defined to wxStandardPathsCF when compiling this file." -#endif - #if defined(__WXCOCOA__) || defined(__WXMAC_OSX__) #define kDefaultPathStyle kCFURLPOSIXPathStyle #else #define kDefaultPathStyle kCFURLHFSPathStyle #endif -static wxString BundleRelativeURLToPath(CFURLRef relativeURL) -{ - CFURLRef absoluteURL = CFURLCopyAbsoluteURL(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()); -} +// ============================================================================ +// implementation +// ============================================================================ +// ---------------------------------------------------------------------------- +// wxStandardPathsCF ctors/dtor +// ---------------------------------------------------------------------------- -static wxStandardPaths gs_stdPaths; -/* static */ wxStandardPaths& wxStandardPaths::Get() -{ - return gs_stdPaths; -} - -wxStandardPaths::wxStandardPaths() -: m_bundle(CFBundleGetMainBundle()) +wxStandardPathsCF::wxStandardPathsCF() + : m_bundle(CFBundleGetMainBundle()) { CFRetain(m_bundle); } -wxStandardPaths::wxStandardPaths(struct __CFBundle *bundle) -: m_bundle(bundle) +wxStandardPathsCF::wxStandardPathsCF(wxCFBundleRef bundle) + : m_bundle(bundle) { CFRetain(m_bundle); } -wxStandardPaths::~wxStandardPaths() +wxStandardPathsCF::~wxStandardPathsCF() { CFRelease(m_bundle); } -void wxStandardPaths::SetBundle(struct __CFBundle *bundle) +// ---------------------------------------------------------------------------- +// wxStandardPathsCF Mac-specific methods +// ---------------------------------------------------------------------------- + +void wxStandardPathsCF::SetBundle(wxCFBundleRef bundle) { CFRetain(bundle); CFRelease(m_bundle); m_bundle = bundle; } -wxString wxStandardPaths::GetConfigDir() const +// ---------------------------------------------------------------------------- +// generic functions in terms of which the other ones are implemented +// ---------------------------------------------------------------------------- + +static wxString BundleRelativeURLToPath(CFURLRef relativeURL) +{ + CFURLRef absoluteURL = CFURLCopyAbsoluteURL(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()); +} + +wxString wxStandardPathsCF::GetFromFunc(wxCFURLRef (*func)(wxCFBundleRef)) const +{ + wxCHECK_MSG(m_bundle, wxEmptyString, + wxT("wxStandardPaths for CoreFoundation only works with bundled apps")); + CFURLRef relativeURL = (*func)(m_bundle); + wxCHECK_MSG(relativeURL, wxEmptyString, wxT("Couldn't get URL")); + wxString ret(BundleRelativeURLToPath(relativeURL)); + CFRelease(relativeURL); + return ret; +} + +wxString wxStandardPathsCF::GetDocumentsDir() const +{ +#ifdef __WXMAC__ + return wxMacFindFolderNoSeparator + ( +#if TARGET_API_MAC_OSX + kUserDomain, +#else + kOnSystemDisk, +#endif + kDocumentsFolderType, + kCreateFolder + ); +#else + return wxFileName::GetHomeDir() + wxT("/Documents"); +#endif +} + +// ---------------------------------------------------------------------------- +// wxStandardPathsCF public API +// ---------------------------------------------------------------------------- + +wxString wxStandardPathsCF::GetConfigDir() const { - // TODO: What do we do for pure Carbon? +#ifdef __WXMAC__ + return wxMacFindFolder((short)kLocalDomain, kPreferencesFolderType, kCreateFolder); +#else return wxT("/Library/Preferences"); +#endif } -wxString wxStandardPaths::GetUserConfigDir() const +wxString wxStandardPathsCF::GetUserConfigDir() const { - // TODO: What do we do for pure Carbon? +#ifdef __WXMAC__ + return wxMacFindFolder((short)kUserDomain, kPreferencesFolderType, kCreateFolder); +#else return wxFileName::GetHomeDir() + wxT("/Library/Preferences"); +#endif } -wxString wxStandardPaths::GetDataDir() const +wxString wxStandardPathsCF::GetDataDir() const { - wxCHECK_MSG(m_bundle, wxEmptyString, wxT("wxStandardPaths for CoreFoundation only works with bundled apps")); - CFURLRef relativeURL = CFBundleCopySharedSupportURL(m_bundle); - wxCHECK_MSG(relativeURL, wxEmptyString, wxT("Couldn't get SharedSupport URL")); - wxString ret(BundleRelativeURLToPath(relativeURL)); - CFRelease(relativeURL); - return ret; + return GetFromFunc(CFBundleCopySharedSupportURL); +} + +// TODO: implement this using real CoreFoundation API instead of Carbon API +wxString wxStandardPathsCF::GetExecutablePath() const +{ +#ifdef __WXMAC__ + ProcessInfoRec processinfo; + ProcessSerialNumber procno ; + FSSpec fsSpec; + + procno.highLongOfPSN = 0 ; + procno.lowLongOfPSN = kCurrentProcess ; + processinfo.processInfoLength = sizeof(ProcessInfoRec); + processinfo.processName = NULL; + processinfo.processAppSpec = &fsSpec; + + GetProcessInformation( &procno , &processinfo ) ; + return wxMacFSSpec2MacFilename(&fsSpec); +#else + return wxStandardPathsBase::GetExecutablePath(); +#endif } -wxString wxStandardPaths::GetLocalDataDir() const +wxString wxStandardPathsCF::GetLocalDataDir() const { +#ifdef __WXMAC__ + return AppendAppName(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder)); +#else return AppendAppName(wxT("/Library/Application Support")); +#endif } -wxString wxStandardPaths::GetUserDataDir() const +wxString wxStandardPathsCF::GetUserDataDir() const { +#ifdef __WXMAC__ + return AppendAppName(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder)); +#else return AppendAppName(wxFileName::GetHomeDir() + _T("/Library/Application Support")); +#endif } -wxString wxStandardPaths::GetPluginsDir() const +wxString wxStandardPathsCF::GetPluginsDir() const { - wxCHECK_MSG(m_bundle, wxEmptyString, wxT("wxStandardPaths for CoreFoundation only works with bundled apps")); - CFURLRef relativeURL = CFBundleCopyBuiltInPlugInsURL(m_bundle); - wxCHECK_MSG(relativeURL, wxEmptyString, wxT("Couldn't get BuiltInPlugIns URL")); - wxString ret(BundleRelativeURLToPath(relativeURL)); - CFRelease(relativeURL); - return ret; + return GetFromFunc(CFBundleCopyBuiltInPlugInsURL); +} + +wxString wxStandardPathsCF::GetResourcesDir() const +{ + return GetFromFunc(CFBundleCopyResourcesDirectoryURL); +} + +wxString +wxStandardPathsCF::GetLocalizedResourcesDir(const wxString& lang, + ResourceCat category) const +{ + return wxStandardPathsBase:: + GetLocalizedResourcesDir(lang, category) + _T(".lproj"); } +#endif // wxUSE_STDPATHS