From 885d927e36935a0077c27fa998bc38e5244d2416 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 20 Jun 2010 14:53:34 +0000 Subject: [PATCH] no trailing slash for OSX_CARBON git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/core/stdpaths_cf.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osx/core/stdpaths_cf.cpp b/src/osx/core/stdpaths_cf.cpp index df8a8db610..9bd76152f9 100644 --- a/src/osx/core/stdpaths_cf.cpp +++ b/src/osx/core/stdpaths_cf.cpp @@ -118,7 +118,7 @@ wxString wxStandardPathsCF::GetDocumentsDir() const wxString wxStandardPathsCF::GetConfigDir() const { #if defined( __WXMAC__ ) && wxOSX_USE_CARBON - return wxMacFindFolder((short)kLocalDomain, kPreferencesFolderType, kCreateFolder); + return wxMacFindFolderNoSeparator((short)kLocalDomain, kPreferencesFolderType, kCreateFolder); #else return wxT("/Library/Preferences"); #endif @@ -127,7 +127,7 @@ wxString wxStandardPathsCF::GetConfigDir() const wxString wxStandardPathsCF::GetUserConfigDir() const { #if defined( __WXMAC__ ) && wxOSX_USE_CARBON - return wxMacFindFolder((short)kUserDomain, kPreferencesFolderType, kCreateFolder); + return wxMacFindFolderNoSeparator((short)kUserDomain, kPreferencesFolderType, kCreateFolder); #else return wxFileName::GetHomeDir() + wxT("/Library/Preferences"); #endif @@ -179,7 +179,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const wxString wxStandardPathsCF::GetLocalDataDir() const { #if defined( __WXMAC__ ) && wxOSX_USE_CARBON - return AppendAppInfo(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder)); + return AppendAppInfo(wxMacFindFolderNoSeparator((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder)); #else return AppendAppInfo(wxT("/Library/Application Support")); #endif @@ -188,7 +188,7 @@ wxString wxStandardPathsCF::GetLocalDataDir() const wxString wxStandardPathsCF::GetUserDataDir() const { #if defined( __WXMAC__ ) && wxOSX_USE_CARBON - return AppendAppInfo(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder)); + return AppendAppInfo(wxMacFindFolderNoSeparator((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder)); #else return AppendAppInfo(wxFileName::GetHomeDir() + wxT("/Library/Application Support")); #endif