AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no trailing slash for OSX_CARBON

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2010-06-20 14:53:34 +00:00
parent 8478eff5b4
commit 885d927e36
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osx/core/stdpaths_cf.cpp
View File

@ -118,7 +118,7 @@ wxString wxStandardPathsCF::GetDocumentsDir() const
wxString wxStandardPathsCF::GetConfigDir() const wxString wxStandardPathsCF::GetConfigDir() const
{ {
#if defined( __WXMAC__ ) && wxOSX_USE_CARBON #if defined( __WXMAC__ ) && wxOSX_USE_CARBON
return wxMacFindFolder((short)kLocalDomain, kPreferencesFolderType, kCreateFolder); return wxMacFindFolderNoSeparator((short)kLocalDomain, kPreferencesFolderType, kCreateFolder);
#else #else
return wxT("/Library/Preferences"); return wxT("/Library/Preferences");
#endif #endif
@ -127,7 +127,7 @@ wxString wxStandardPathsCF::GetConfigDir() const
wxString wxStandardPathsCF::GetUserConfigDir() const wxString wxStandardPathsCF::GetUserConfigDir() const
{ {
#if defined( __WXMAC__ ) && wxOSX_USE_CARBON #if defined( __WXMAC__ ) && wxOSX_USE_CARBON
return wxMacFindFolder((short)kUserDomain, kPreferencesFolderType, kCreateFolder); return wxMacFindFolderNoSeparator((short)kUserDomain, kPreferencesFolderType, kCreateFolder);
#else #else
return wxFileName::GetHomeDir() + wxT("/Library/Preferences"); return wxFileName::GetHomeDir() + wxT("/Library/Preferences");
#endif #endif
@ -179,7 +179,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
wxString wxStandardPathsCF::GetLocalDataDir() const wxString wxStandardPathsCF::GetLocalDataDir() const
{ {
#if defined( __WXMAC__ ) && wxOSX_USE_CARBON #if defined( __WXMAC__ ) && wxOSX_USE_CARBON
return AppendAppInfo(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder)); return AppendAppInfo(wxMacFindFolderNoSeparator((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder));
#else #else
return AppendAppInfo(wxT("/Library/Application Support")); return AppendAppInfo(wxT("/Library/Application Support"));
#endif #endif
@ -188,7 +188,7 @@ wxString wxStandardPathsCF::GetLocalDataDir() const
wxString wxStandardPathsCF::GetUserDataDir() const wxString wxStandardPathsCF::GetUserDataDir() const
{ {
#if defined( __WXMAC__ ) && wxOSX_USE_CARBON #if defined( __WXMAC__ ) && wxOSX_USE_CARBON
return AppendAppInfo(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder)); return AppendAppInfo(wxMacFindFolderNoSeparator((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder));
#else #else
return AppendAppInfo(wxFileName::GetHomeDir() + wxT("/Library/Application Support")); return AppendAppInfo(wxFileName::GetHomeDir() + wxT("/Library/Application Support"));
#endif #endif