was missing in xti merge

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

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index dd9fb2801fb3458ab5a1f0b53c4a707a5d1d657e..9a02bdc8dbc7b36970d8be1d07724a9c5bb863fe 100644 (file)
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -6,7 +6,7 @@
 // Created:     2004-10-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     2004-10-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -24,8 +24,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_STDPATHS
-

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif //WX_PRECOMP
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif //WX_PRECOMP


@@ -45,19 +43,49 @@ static wxStandardPaths gs_stdPaths;
 // ============================================================================
 
 /* static */
 // ============================================================================
 
 /* static */

-wxStandardPathsBase& wxStandardPathsBase::Get()
+wxStandardPaths& wxStandardPathsBase::Get()

 {
     wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
 {
     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();
 }
 
 
     return traits->GetStandardPaths();
 }
 

-wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()
+wxString wxStandardPathsBase::GetExecutablePath() const
+{
+    if ( !wxTheApp || !wxTheApp->argv )
+        return wxEmptyString;
+
+    wxString argv0 = wxTheApp->argv[0];
+    if (wxIsAbsolutePath(argv0))
+        return argv0;
+
+    // Search PATH.environment variable...
+    wxPathList pathlist;
+    pathlist.AddEnvList(wxT("PATH"));
+    wxString path = pathlist.FindAbsoluteValidPath(argv0);
+    if ( path.empty() )
+        return argv0;       // better than nothing
+
+    wxFileName filename(path);
+    filename.Normalize();
+    return filename.GetFullPath();
+}
+
+wxStandardPaths& wxAppTraitsBase::GetStandardPaths()

 {
     return gs_stdPaths;
 }
 
 {
     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
 wxStandardPathsBase::~wxStandardPathsBase()
 {
     // nothing to do here


@@ -78,6 +106,14 @@ wxString wxStandardPathsBase::GetDocumentsDir() const
     return wxFileName::GetHomeDir();
 }
 
     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
 {
 // return the temporary directory for the current user
 wxString wxStandardPathsBase::GetTempDir() const
 {


@@ -85,25 +121,43 @@ wxString wxStandardPathsBase::GetTempDir() const
 }
 
 /* static */
 }
 
 /* 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() )
     {
 {
     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);
         {
             const wxChar ch = *(subdir.end() - 1);

-            if ( !wxFileName::IsPathSeparator(ch) && ch != _T('.') )
+            if ( !wxFileName::IsPathSeparator(ch) && ch != wxT('.') )

                 subdir += wxFileName::GetPathSeparator();
 
                 subdir += wxFileName::GetPathSeparator();
 

-            subdir += appname;
+            subdir += component;

         }
     }
 
     return subdir;
 }
 
         }
     }
 
     return subdir;
 }
 

-#endif // wxUSE_STDPATHS
+
+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;
+}
+