moving OnInit to a later stage to avoid Carbon Emulation artifacts by the OS, fixes...

[wxWidgets.git] / src / osx / core / stdpaths_cf.cpp

diff --git a/src/osx/core/stdpaths_cf.cpp b/src/osx/core/stdpaths_cf.cpp
index 3c80821371725625af32997f7d81feb58a46d052..df8a8db610cc273b055035b43b1babea6102d82a 100644 (file)
--- a/src/osx/core/stdpaths_cf.cpp
+++ b/src/osx/core/stdpaths_cf.cpp
@@ -49,14 +49,12 @@ wxStandardPathsCF::wxStandardPathsCF()
                  : m_bundle(CFBundleGetMainBundle())
 {
     CFRetain(m_bundle);
-    UseAppInfo(AppInfo_AppName | AppInfo_VendorName);
 }
 
 wxStandardPathsCF::wxStandardPathsCF(wxCFBundleRef bundle)
                  : m_bundle(bundle)
 {
     CFRetain(m_bundle);
-    UseAppInfo(AppInfo_AppName | AppInfo_VendorName);
 }
 
 wxStandardPathsCF::~wxStandardPathsCF()
@@ -154,7 +152,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
 #else
     FSSpec fsSpec;
 #endif
-    
+
     procno.highLongOfPSN = 0 ;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
@@ -164,7 +162,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
 #else
     processinfo.processAppSpec = &fsSpec;
 #endif
-    
+
     GetProcessInformation( &procno , &processinfo ) ;
 #ifdef __LP64__
     return wxMacFSRefToPath(&fsRef);
@@ -172,7 +170,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
     return wxMacFSSpec2MacFilename(&fsSpec);
 #endif
 #endif
-    
+
 #else
     return wxStandardPathsBase::GetExecutablePath();
 #endif
@@ -192,7 +190,7 @@ wxString wxStandardPathsCF::GetUserDataDir() const
 #if defined( __WXMAC__ ) && wxOSX_USE_CARBON
     return AppendAppInfo(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder));
 #else
-    return AppendAppInfo(wxFileName::GetHomeDir() + _T("/Library/Application Support"));
+    return AppendAppInfo(wxFileName::GetHomeDir() + wxT("/Library/Application Support"));
 #endif
 }
 
@@ -211,7 +209,7 @@ wxStandardPathsCF::GetLocalizedResourcesDir(const wxString& lang,
                                             ResourceCat category) const
 {
     return wxStandardPathsBase::
-            GetLocalizedResourcesDir(lang, category) + _T(".lproj");
+            GetLocalizedResourcesDir(lang, category) + wxT(".lproj");
 }
 
 #endif // wxUSE_STDPATHS