X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adb61e4d0d1a68b6d79d68615e9dc947e8828e6d..f2c88494b6978bee502f4c856ba9dc7e3b7c3954:/src/common/stdpbase.cpp?ds=sidebyside diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp index 57a729623e..18ad257b92 100644 --- a/src/common/stdpbase.cpp +++ b/src/common/stdpbase.cpp @@ -24,12 +24,12 @@ #pragma hdrstop #endif -// FIXME: there is no Mac implementation yet -#ifndef __WXMAC__ +#if wxUSE_STDPATHS #ifndef WX_PRECOMP #include "wx/app.h" #endif //WX_PRECOMP +#include "wx/apptrait.h" #include "wx/filename.h" #include "wx/stdpaths.h" @@ -45,7 +45,15 @@ static wxStandardPaths gs_stdPaths; // ============================================================================ /* static */ -wxStandardPaths& wxStandardPathsBase::Get() +wxStandardPathsBase& wxStandardPathsBase::Get() +{ + wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL; + wxCHECK_MSG( traits, gs_stdPaths, _T("create wxApp before calling this") ); + + return traits->GetStandardPaths(); +} + +wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths() { return gs_stdPaths; } @@ -65,12 +73,17 @@ wxString wxStandardPathsBase::GetUserLocalDataDir() const return GetUserDataDir(); } +wxString wxStandardPathsBase::GetDocumentsDir() const +{ + return wxFileName::GetHomeDir(); +} + /* static */ wxString wxStandardPathsBase::AppendAppName(const wxString& dir) { wxString subdir(dir); - // empty string indicates that an error has occured, don't touch it then + // empty string indicates that an error has occurred, don't touch it then if ( !subdir.empty() ) { const wxString appname = wxTheApp->GetAppName(); @@ -87,5 +100,4 @@ wxString wxStandardPathsBase::AppendAppName(const wxString& dir) return subdir; } -#endif // !__WXMAC__ - +#endif // wxUSE_STDPATHS