switch to cf implementation

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

diff --git a/src/mac/corefoundation/stdpaths_cf.cpp b/src/mac/corefoundation/stdpaths_cf.cpp
index eeaa7453e522496f095ffbce38827a150b6eabd2..928b6dc1ad6376536fbbe17df11218d9b788ae20 100644 (file)
--- a/src/mac/corefoundation/stdpaths_cf.cpp
+++ b/src/mac/corefoundation/stdpaths_cf.cpp
@@ -104,11 +104,7 @@ wxString wxStandardPathsCF::GetDocumentsDir() const
 #ifdef __WXMAC__
     return wxMacFindFolderNoSeparator
         (
 #ifdef __WXMAC__
     return wxMacFindFolderNoSeparator
         (

-#if TARGET_API_MAC_OSX

         kUserDomain,
         kUserDomain,

-#else
-        kOnSystemDisk,
-#endif

         kDocumentsFolderType,
         kCreateFolder
         );
         kDocumentsFolderType,
         kCreateFolder
         );


@@ -144,26 +140,39 @@ wxString wxStandardPathsCF::GetDataDir() const
     return GetFromFunc(CFBundleCopySharedSupportURL);
 }
 
     return GetFromFunc(CFBundleCopySharedSupportURL);
 }
 

-// TODO: implement this using real CoreFoundation API instead of Carbon API

 wxString wxStandardPathsCF::GetExecutablePath() const
 {
 #ifdef __WXMAC__
 wxString wxStandardPathsCF::GetExecutablePath() const
 {
 #ifdef __WXMAC__

+#if 1
+    return GetFromFunc(CFBundleCopyBundleURL);
+#else
+    // TODO remove if cf implementation ok

     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;

+#ifdef __LP64__
+    FSRef  fsRef;
+#else

     FSSpec fsSpec;
     FSSpec fsSpec;

-
+#endif
+    

     procno.highLongOfPSN = 0 ;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;
     procno.highLongOfPSN = 0 ;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;

+#ifdef __LP64__
+    processinfo.processAppRef = &fsRef;
+#else

     processinfo.processAppSpec = &fsSpec;
     processinfo.processAppSpec = &fsSpec;

-
+#endif
+    

     GetProcessInformation( &procno , &processinfo ) ;
 #ifdef __LP64__
     return wxMacFSRefToPath(&fsRef);
 #else
     return wxMacFSSpec2MacFilename(&fsSpec);
 #endif
     GetProcessInformation( &procno , &processinfo ) ;
 #ifdef __LP64__
     return wxMacFSRefToPath(&fsRef);
 #else
     return wxMacFSSpec2MacFilename(&fsSpec);
 #endif

+#endif
+    

 #else
     return wxStandardPathsBase::GetExecutablePath();
 #endif
 #else
     return wxStandardPathsBase::GetExecutablePath();
 #endif