iphone additions

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

diff --git a/src/mac/corefoundation/stdpaths_cf.cpp b/src/mac/corefoundation/stdpaths_cf.cpp
index 5d93769869e4f3b69dcb3ccca070dbc9489222d3..69e524f1fc59cc66ac17dfc5a29ce5a1037277c9 100644 (file)
--- a/src/mac/corefoundation/stdpaths_cf.cpp
+++ b/src/mac/corefoundation/stdpaths_cf.cpp
@@ -101,7 +101,7 @@ wxString wxStandardPathsCF::GetFromFunc(wxCFURLRef (*func)(wxCFBundleRef)) const
 
 wxString wxStandardPathsCF::GetDocumentsDir() const
 {
 
 wxString wxStandardPathsCF::GetDocumentsDir() const
 {

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)

     return wxMacFindFolderNoSeparator
         (
         kUserDomain,
     return wxMacFindFolderNoSeparator
         (
         kUserDomain,


@@ -119,7 +119,7 @@ wxString wxStandardPathsCF::GetDocumentsDir() const
 
 wxString wxStandardPathsCF::GetConfigDir() const
 {
 
 wxString wxStandardPathsCF::GetConfigDir() const
 {

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)

     return wxMacFindFolder((short)kLocalDomain, kPreferencesFolderType, kCreateFolder);
 #else
     return wxT("/Library/Preferences");
     return wxMacFindFolder((short)kLocalDomain, kPreferencesFolderType, kCreateFolder);
 #else
     return wxT("/Library/Preferences");


@@ -128,7 +128,7 @@ wxString wxStandardPathsCF::GetConfigDir() const
 
 wxString wxStandardPathsCF::GetUserConfigDir() const
 {
 
 wxString wxStandardPathsCF::GetUserConfigDir() const
 {

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)

     return wxMacFindFolder((short)kUserDomain, kPreferencesFolderType, kCreateFolder);
 #else
     return wxFileName::GetHomeDir() + wxT("/Library/Preferences");
     return wxMacFindFolder((short)kUserDomain, kPreferencesFolderType, kCreateFolder);
 #else
     return wxFileName::GetHomeDir() + wxT("/Library/Preferences");


@@ -180,7 +180,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
 
 wxString wxStandardPathsCF::GetLocalDataDir() const
 {
 
 wxString wxStandardPathsCF::GetLocalDataDir() const
 {

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)

     return AppendAppInfo(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder));
 #else
     return AppendAppInfo(wxT("/Library/Application Support"));
     return AppendAppInfo(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder));
 #else
     return AppendAppInfo(wxT("/Library/Application Support"));


@@ -189,7 +189,7 @@ wxString wxStandardPathsCF::GetLocalDataDir() const
 
 wxString wxStandardPathsCF::GetUserDataDir() const
 {
 
 wxString wxStandardPathsCF::GetUserDataDir() const
 {

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)

     return AppendAppInfo(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder));
 #else
     return AppendAppInfo(wxFileName::GetHomeDir() + _T("/Library/Application Support"));
     return AppendAppInfo(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder));
 #else
     return AppendAppInfo(wxFileName::GetHomeDir() + _T("/Library/Application Support"));