improved wxMac event loop implementation and refactored the code to share it with...

[wxWidgets.git] / src / common / stdpbase.cpp

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 4d477a297490703f8b2b199ffd7dc20d24f5d540..6f9bba7c978ced79ea4c8fcc073a77c3534bbe58 100644 (file)
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -24,6 +24,14 @@
     #pragma hdrstop
 #endif
 
+#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"
 
 // ----------------------------------------------------------------------------
@@ -37,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;
 }
@@ -57,3 +73,26 @@ wxString wxStandardPathsBase::GetUserLocalDataDir() const
     return GetUserDataDir();
 }
 
+/* static */
+wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
+{
+    wxString subdir(dir);
+
+    // empty string indicates that an error has occurred, don't touch it then
+    if ( !subdir.empty() )
+    {
+        const wxString appname = wxTheApp->GetAppName();
+        if ( !appname.empty() )
+        {
+            const wxChar ch = *(subdir.end() - 1);
+            if ( !wxFileName::IsPathSeparator(ch) && ch != _T('.') )
+                subdir += wxFileName::GetPathSeparator();
+
+            subdir += appname;
+        }
+    }
+
+    return subdir;
+}
+
+#endif // wxUSE_STDPATHS