Fix formatting of the local time zone when DST is in effect.

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

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 04cebb8587d2f885be5ceab3e82daaa95fdea7ee..e421f3b26a3da97aa27dba1a1ece6f34b12f6aee 100644 (file)
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/stdpbase.cpp
+// Name:        src/common/stdpbase.cpp
 // Purpose:     wxStandardPathsBase methods common to all ports
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -43,10 +43,10 @@ static wxStandardPaths gs_stdPaths;
 // ============================================================================
 
 /* static */
-wxStandardPathsBase& wxStandardPathsBase::Get()
+wxStandardPaths& wxStandardPathsBase::Get()
 {
     wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-    wxCHECK_MSG( traits, gs_stdPaths, _T("create wxApp before calling this") );
+    wxCHECK_MSG( traits, gs_stdPaths, wxT("create wxApp before calling this") );
 
     return traits->GetStandardPaths();
 }
@@ -72,7 +72,7 @@ wxString wxStandardPathsBase::GetExecutablePath() const
     return filename.GetFullPath();
 }
 
-wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()
+wxStandardPaths& wxAppTraitsBase::GetStandardPaths()
 {
     return gs_stdPaths;
 }
@@ -106,6 +106,14 @@ wxString wxStandardPathsBase::GetDocumentsDir() const
     return wxFileName::GetHomeDir();
 }
 
+wxString wxStandardPathsBase::GetAppDocumentsDir() const
+{
+    const wxString docsDir = GetDocumentsDir();
+    wxString appDocsDir = AppendAppInfo(docsDir);
+
+    return wxDirExists(appDocsDir) ? appDocsDir : docsDir;
+}
+
 // return the temporary directory for the current user
 wxString wxStandardPathsBase::GetTempDir() const
 {
@@ -113,7 +121,9 @@ wxString wxStandardPathsBase::GetTempDir() const
 }
 
 /* static */
-wxString wxStandardPathsBase::AppendPathComponent(const wxString& dir, const wxString& component)
+wxString
+wxStandardPathsBase::AppendPathComponent(const wxString& dir,
+                                         const wxString& component)
 {
     wxString subdir(dir);
 
@@ -123,7 +133,7 @@ wxString wxStandardPathsBase::AppendPathComponent(const wxString& dir, const wxS
         if ( !component.empty() )
         {
             const wxChar ch = *(subdir.end() - 1);
-            if ( !wxFileName::IsPathSeparator(ch) && ch != _T('.') )
+            if ( !wxFileName::IsPathSeparator(ch) && ch != wxT('.') )
                 subdir += wxFileName::GetPathSeparator();
 
             subdir += component;