X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adb61e4d0d1a68b6d79d68615e9dc947e8828e6d..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/common/stdpbase.cpp?ds=sidebyside

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 57a729623e..5c104c2fe9 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,12 @@ static wxStandardPaths gs_stdPaths;
 // ============================================================================
 
 /* static */
-wxStandardPaths& wxStandardPathsBase::Get()
+wxStandardPathsBase& wxStandardPathsBase::Get()
+{
+    return wxTheApp->GetTraits()->GetStandardPaths();
+}
+
+wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()
 {
     return gs_stdPaths;
 }
@@ -70,7 +75,7 @@ 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 +92,4 @@ wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
     return subdir;
 }
 
-#endif // !__WXMAC__
-
+#endif // wxUSE_STDPATHS