X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adb61e4d0d1a68b6d79d68615e9dc947e8828e6d..92850d6b2ff6072f4801152fd6bfdb7263715ec0:/src/common/stdpbase.cpp diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp index 57a729623e..ab6b882ef6 100644 --- a/src/common/stdpbase.cpp +++ b/src/common/stdpbase.cpp @@ -24,12 +24,10 @@ #pragma hdrstop #endif -// FIXME: there is no Mac implementation yet -#ifndef __WXMAC__ - #ifndef WX_PRECOMP #include "wx/app.h" #endif //WX_PRECOMP +#include "wx/apptrait.h" #include "wx/filename.h" #include "wx/stdpaths.h" @@ -45,7 +43,12 @@ static wxStandardPaths gs_stdPaths; // ============================================================================ /* static */ -wxStandardPaths& wxStandardPathsBase::Get() +wxStandardPathsBase& wxStandardPathsBase::Get() +{ + return wxTheApp->GetTraits()->GetStandardPaths(); +} + +wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths() { return gs_stdPaths; } @@ -87,5 +90,3 @@ wxString wxStandardPathsBase::AppendAppName(const wxString& dir) return subdir; } -#endif // !__WXMAC__ -