applied patch 1378261

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/corefoundation/stdpaths_cf.cpp b/src/mac/corefoundation/stdpaths_cf.cpp
index 62725328e3d8d0e55aa5f960b608a345ed41c10b..eb6e0367bf9ed7446a13d9bd464d6a94a8a3beb9 100644 (file)
--- a/src/mac/corefoundation/stdpaths_cf.cpp
+++ b/src/mac/corefoundation/stdpaths_cf.cpp
@@ -27,6 +27,9 @@
 
 #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__)
@@ -109,14 +112,20 @@ wxString wxStandardPathsCF::GetFromFunc(wxCFURLRef (*func)(wxCFBundleRef)) const
 
 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 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 wxStandardPathsCF::GetDataDir() const
@@ -126,12 +135,20 @@ wxString wxStandardPathsCF::GetDataDir() const
 
 wxString wxStandardPathsCF::GetLocalDataDir() const
 {
+#ifdef __WXMAC__
+    return AppendAppName(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder));
+#else
     return AppendAppName(wxT("/Library/Application Support"));
+#endif
 }
 
 wxString wxStandardPathsCF::GetUserDataDir() const
 {
+#ifdef __WXMAC__
+    return AppendAppName(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder));
+#else
     return AppendAppName(wxFileName::GetHomeDir() + _T("/Library/Application Support"));
+#endif
 }
 
 wxString wxStandardPathsCF::GetPluginsDir() const