Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch 1378261

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-04-07 19:21:50 +00:00
parent c4d9fc3947
commit f5158fa61f
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mac/corefoundation/stdpaths_cf.cpp
View File

@@ -27,6 +27,9 @@
#include "wx/stdpaths.h" #include "wx/stdpaths.h"
#include "wx/filename.h" #include "wx/filename.h"
#ifdef __WXMAC__
#include "wx/mac/private.h"
#endif
#include "wx/mac/corefoundation/cfstring.h" #include "wx/mac/corefoundation/cfstring.h"
#if defined(__DARWIN__) #if defined(__DARWIN__)
@@ -109,14 +112,20 @@ wxString wxStandardPathsCF::GetFromFunc(wxCFURLRef (*func)(wxCFBundleRef)) const
wxString wxStandardPathsCF::GetConfigDir() const wxString wxStandardPathsCF::GetConfigDir() const
{ {
// TODO: What do we do for pure Carbon? #ifdef __WXMAC__
return wxMacFindFolder((short)kLocalDomain, kPreferencesFolderType, kCreateFolder);
#else
return wxT("/Library/Preferences"); return wxT("/Library/Preferences");
#endif
} }
wxString wxStandardPathsCF::GetUserConfigDir() const wxString wxStandardPathsCF::GetUserConfigDir() const
{ {
// TODO: What do we do for pure Carbon? #ifdef __WXMAC__
return wxMacFindFolder((short)kUserDomain, kPreferencesFolderType, kCreateFolder);
#else
return wxFileName::GetHomeDir() + wxT("/Library/Preferences"); return wxFileName::GetHomeDir() + wxT("/Library/Preferences");
#endif
} }
wxString wxStandardPathsCF::GetDataDir() const wxString wxStandardPathsCF::GetDataDir() const
@@ -126,12 +135,20 @@ wxString wxStandardPathsCF::GetDataDir() const
wxString wxStandardPathsCF::GetLocalDataDir() const wxString wxStandardPathsCF::GetLocalDataDir() const
{ {
#ifdef __WXMAC__
return AppendAppName(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder));
#else
return AppendAppName(wxT("/Library/Application Support")); return AppendAppName(wxT("/Library/Application Support"));
#endif
} }
wxString wxStandardPathsCF::GetUserDataDir() const wxString wxStandardPathsCF::GetUserDataDir() const
{ {
#ifdef __WXMAC__
return AppendAppName(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder));
#else
return AppendAppName(wxFileName::GetHomeDir() + _T("/Library/Application Support")); return AppendAppName(wxFileName::GetHomeDir() + _T("/Library/Application Support"));
#endif
} }
wxString wxStandardPathsCF::GetPluginsDir() const wxString wxStandardPathsCF::GetPluginsDir() const