X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/489468feaa08b8f504735eecca522fb8d0f825d2..e812e279ba1c7358956ec7809d60b6a27741af47:/src/osx/core/stdpaths_cf.cpp?ds=sidebyside

diff --git a/src/osx/core/stdpaths_cf.cpp b/src/osx/core/stdpaths_cf.cpp
index 69e524f1fc..df8a8db610 100644
--- a/src/osx/core/stdpaths_cf.cpp
+++ b/src/osx/core/stdpaths_cf.cpp
@@ -28,9 +28,9 @@
 #include "wx/stdpaths.h"
 #include "wx/filename.h"
 #ifdef __WXMAC__
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 #endif
-#include "wx/mac/corefoundation/cfstring.h"
+#include "wx/osx/core/cfstring.h"
 
 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFURL.h>
@@ -49,14 +49,12 @@ 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()
@@ -101,7 +99,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 +117,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 +126,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 +152,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
 #else
     FSSpec fsSpec;
 #endif
-    
+
     procno.highLongOfPSN = 0 ;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
@@ -164,7 +162,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
 #else
     processinfo.processAppSpec = &fsSpec;
 #endif
-    
+
     GetProcessInformation( &procno , &processinfo ) ;
 #ifdef __LP64__
     return wxMacFSRefToPath(&fsRef);
@@ -172,7 +170,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
     return wxMacFSSpec2MacFilename(&fsSpec);
 #endif
 #endif
-    
+
 #else
     return wxStandardPathsBase::GetExecutablePath();
 #endif
@@ -180,7 +178,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 +187,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 +209,7 @@ wxStandardPathsCF::GetLocalizedResourcesDir(const wxString& lang,
                                             ResourceCat category) const
 {
     return wxStandardPathsBase::
-            GetLocalizedResourcesDir(lang, category) + _T(".lproj");
+            GetLocalizedResourcesDir(lang, category) + wxT(".lproj");
 }
 
 #endif // wxUSE_STDPATHS