X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c8ef3d5565e6f1c1a23baa3be7d6a7b42151c616..b3cec67186d678d2c3985923bdb8c787455cf369:/src/osx/core/stdpaths_cf.cpp diff --git a/src/osx/core/stdpaths_cf.cpp b/src/osx/core/stdpaths_cf.cpp index b144a77ae0..8a1cee42a5 100644 --- a/src/osx/core/stdpaths_cf.cpp +++ b/src/osx/core/stdpaths_cf.cpp @@ -101,7 +101,7 @@ wxString wxStandardPathsCF::GetFromFunc(wxCFURLRef (*func)(wxCFBundleRef)) const wxString wxStandardPathsCF::GetDocumentsDir() const { -#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__) +#if defined( __WXMAC__ ) && wxOSX_USE_CARBON return wxMacFindFolderNoSeparator ( kUserDomain, @@ -119,7 +119,7 @@ wxString wxStandardPathsCF::GetDocumentsDir() const wxString wxStandardPathsCF::GetConfigDir() const { -#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__) +#if defined( __WXMAC__ ) && wxOSX_USE_CARBON return wxMacFindFolder((short)kLocalDomain, kPreferencesFolderType, kCreateFolder); #else return wxT("/Library/Preferences"); @@ -128,7 +128,7 @@ wxString wxStandardPathsCF::GetConfigDir() const wxString wxStandardPathsCF::GetUserConfigDir() const { -#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__) +#if defined( __WXMAC__ ) && wxOSX_USE_CARBON return wxMacFindFolder((short)kUserDomain, kPreferencesFolderType, kCreateFolder); #else return wxFileName::GetHomeDir() + wxT("/Library/Preferences"); @@ -154,7 +154,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const #else FSSpec fsSpec; #endif - + procno.highLongOfPSN = 0 ; procno.lowLongOfPSN = kCurrentProcess ; processinfo.processInfoLength = sizeof(ProcessInfoRec); @@ -164,7 +164,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const #else processinfo.processAppSpec = &fsSpec; #endif - + GetProcessInformation( &procno , &processinfo ) ; #ifdef __LP64__ return wxMacFSRefToPath(&fsRef); @@ -172,7 +172,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const return wxMacFSSpec2MacFilename(&fsSpec); #endif #endif - + #else return wxStandardPathsBase::GetExecutablePath(); #endif @@ -180,7 +180,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const wxString wxStandardPathsCF::GetLocalDataDir() const { -#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__) +#if defined( __WXMAC__ ) && wxOSX_USE_CARBON return AppendAppInfo(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder)); #else return AppendAppInfo(wxT("/Library/Application Support")); @@ -189,10 +189,10 @@ wxString wxStandardPathsCF::GetLocalDataDir() const wxString wxStandardPathsCF::GetUserDataDir() const { -#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__) +#if defined( __WXMAC__ ) && wxOSX_USE_CARBON return AppendAppInfo(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder)); #else - return AppendAppInfo(wxFileName::GetHomeDir() + _T("/Library/Application Support")); + return AppendAppInfo(wxFileName::GetHomeDir() + wxT("/Library/Application Support")); #endif } @@ -211,7 +211,7 @@ wxStandardPathsCF::GetLocalizedResourcesDir(const wxString& lang, ResourceCat category) const { return wxStandardPathsBase:: - GetLocalizedResourcesDir(lang, category) + _T(".lproj"); + GetLocalizedResourcesDir(lang, category) + wxT(".lproj"); } #endif // wxUSE_STDPATHS