mac cleanup, pure cgcolor

[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 12c4e3db0467c63f1d6983147db92190cf16142e..928b6dc1ad6376536fbbe17df11218d9b788ae20 100644 (file)
--- a/src/mac/corefoundation/stdpaths_cf.cpp
+++ b/src/mac/corefoundation/stdpaths_cf.cpp
@@ -32,19 +32,10 @@
 #endif
 #include "wx/mac/corefoundation/cfstring.h"
 
 #endif
 #include "wx/mac/corefoundation/cfstring.h"
 

-#if defined(__DARWIN__)

 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFURL.h>
 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFURL.h>

-#else
-#include <CFBundle.h>
-#include <CFURL.h>
-#endif

 
 

-#if defined(__WXCOCOA__) || defined(__WXMAC_OSX__)

 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 #define kDefaultPathStyle kCFURLPOSIXPathStyle

-#else
-#define kDefaultPathStyle kCFURLHFSPathStyle
-#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -58,12 +49,14 @@ wxStandardPathsCF::wxStandardPathsCF()
                  : m_bundle(CFBundleGetMainBundle())
 {
     CFRetain(m_bundle);
                  : m_bundle(CFBundleGetMainBundle())
 {
     CFRetain(m_bundle);

+    UseAppInfo(AppInfo_AppName | AppInfo_VendorName);

 }
 
 wxStandardPathsCF::wxStandardPathsCF(wxCFBundleRef bundle)
                  : m_bundle(bundle)
 {
     CFRetain(m_bundle);
 }
 
 wxStandardPathsCF::wxStandardPathsCF(wxCFBundleRef bundle)
                  : m_bundle(bundle)
 {
     CFRetain(m_bundle);

+    UseAppInfo(AppInfo_AppName | AppInfo_VendorName);

 }
 
 wxStandardPathsCF::~wxStandardPathsCF()
 }
 
 wxStandardPathsCF::~wxStandardPathsCF()


@@ -111,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
         );


@@ -153,35 +142,57 @@ wxString wxStandardPathsCF::GetDataDir() const
 
 wxString wxStandardPathsCF::GetExecutablePath() const
 {
 
 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;

-
-    procno.highLongOfPSN = NULL ;
+#endif
+    
+    procno.highLongOfPSN = 0 ;

     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;
     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 ) ;
     GetProcessInformation( &procno , &processinfo ) ;

+#ifdef __LP64__
+    return wxMacFSRefToPath(&fsRef);
+#else

     return wxMacFSSpec2MacFilename(&fsSpec);
     return wxMacFSSpec2MacFilename(&fsSpec);

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

 }
 
 wxString wxStandardPathsCF::GetLocalDataDir() const
 {
 #ifdef __WXMAC__
 }
 
 wxString wxStandardPathsCF::GetLocalDataDir() const
 {
 #ifdef __WXMAC__

-    return AppendAppName(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder));
+    return AppendAppInfo(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder));

 #else
 #else

-    return AppendAppName(wxT("/Library/Application Support"));
+    return AppendAppInfo(wxT("/Library/Application Support"));

 #endif
 }
 
 wxString wxStandardPathsCF::GetUserDataDir() const
 {
 #ifdef __WXMAC__
 #endif
 }
 
 wxString wxStandardPathsCF::GetUserDataDir() const
 {
 #ifdef __WXMAC__

-    return AppendAppName(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder));
+    return AppendAppInfo(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder));

 #else
 #else

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

 #endif
 }
 
 #endif
 }
 


@@ -196,7 +207,7 @@ wxString wxStandardPathsCF::GetResourcesDir() const
 }
 
 wxString
 }
 
 wxString

-wxStandardPathsCF::GetLocalizedResourcesDir(const wxChar *lang,
+wxStandardPathsCF::GetLocalizedResourcesDir(const wxString& lang,

                                             ResourceCat category) const
 {
     return wxStandardPathsBase::
                                             ResourceCat category) const
 {
     return wxStandardPathsBase::