Minor header cleaning.

[wxWidgets.git] / src / mac / corefoundation / stdpaths_cf.cpp

diff --git a/src/mac/corefoundation/stdpaths_cf.cpp b/src/mac/corefoundation/stdpaths_cf.cpp
index 62725328e3d8d0e55aa5f960b608a345ed41c10b..451acd14dfc235de373c50c145356572d1d7cf28 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"
 
 #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__)
 #include "wx/mac/corefoundation/cfstring.h"
 
 #if defined(__DARWIN__)


@@ -103,20 +106,44 @@ wxString wxStandardPathsCF::GetFromFunc(wxCFURLRef (*func)(wxCFBundleRef)) const
     return ret;
 }
 
     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
 {
 // ----------------------------------------------------------------------------
 // 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");
     return wxT("/Library/Preferences");

+#endif

 }
 
 wxString wxStandardPathsCF::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");
     return wxFileName::GetHomeDir() + wxT("/Library/Preferences");

+#endif

 }
 
 wxString wxStandardPathsCF::GetDataDir() const
 }
 
 wxString wxStandardPathsCF::GetDataDir() const


@@ -126,12 +153,20 @@ wxString wxStandardPathsCF::GetDataDir() const
 
 wxString wxStandardPathsCF::GetLocalDataDir() const
 {
 
 wxString wxStandardPathsCF::GetLocalDataDir() const
 {

+#ifdef __WXMAC__
+    return AppendAppName(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder));
+#else

     return AppendAppName(wxT("/Library/Application Support"));
     return AppendAppName(wxT("/Library/Application Support"));

+#endif

 }
 
 wxString wxStandardPathsCF::GetUserDataDir() const
 {
 }
 
 wxString wxStandardPathsCF::GetUserDataDir() const
 {

+#ifdef __WXMAC__
+    return AppendAppName(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder));
+#else

     return AppendAppName(wxFileName::GetHomeDir() + _T("/Library/Application Support"));
     return AppendAppName(wxFileName::GetHomeDir() + _T("/Library/Application Support"));

+#endif

 }
 
 wxString wxStandardPathsCF::GetPluginsDir() const
 }
 
 wxString wxStandardPathsCF::GetPluginsDir() const