X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ae3ead6f0ed2b7b1bfc40317e65ffe71e0b3321..8f4745feeb2850f3bebb3af45407e164550d541a:/src/common/stdpbase.cpp?ds=sidebyside diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp index 6d0609e118..6cf9b8a32a 100644 --- a/src/common/stdpbase.cpp +++ b/src/common/stdpbase.cpp @@ -43,7 +43,7 @@ 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") ); @@ -72,11 +72,20 @@ wxString wxStandardPathsBase::GetExecutablePath() const return filename.GetFullPath(); } -wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths() +wxStandardPaths& wxAppTraitsBase::GetStandardPaths() { return gs_stdPaths; } +wxStandardPathsBase::wxStandardPathsBase() +{ + // Set the default information that is used when + // forming some paths (by AppendAppInfo). + // Derived classes can call this in their constructors + // to set the platform-specific settings + UseAppInfo(AppInfo_AppName); +} + wxStandardPathsBase::~wxStandardPathsBase() { // nothing to do here @@ -97,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 { @@ -104,23 +121,43 @@ wxString wxStandardPathsBase::GetTempDir() const } /* static */ -wxString wxStandardPathsBase::AppendAppName(const wxString& dir) +wxString +wxStandardPathsBase::AppendPathComponent(const wxString& dir, + const wxString& component) { 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() ) + if ( !component.empty() ) { const wxChar ch = *(subdir.end() - 1); if ( !wxFileName::IsPathSeparator(ch) && ch != _T('.') ) subdir += wxFileName::GetPathSeparator(); - subdir += appname; + subdir += component; } } return subdir; } + + +wxString wxStandardPathsBase::AppendAppInfo(const wxString& dir) const +{ + wxString subdir(dir); + + if ( UsesAppInfo(AppInfo_VendorName) ) + { + subdir = AppendPathComponent(subdir, wxTheApp->GetVendorName()); + } + + if ( UsesAppInfo(AppInfo_AppName) ) + { + subdir = AppendPathComponent(subdir, wxTheApp->GetAppName()); + } + + return subdir; +} +