restored expanders

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

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 7543b42155f041b4d444e0fbee64330bb960ccfb..6d0609e118d33dd4eaa2786bd21c0c195ea76c68 100644 (file)
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -24,8 +24,6 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_STDPATHS
-
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif //WX_PRECOMP
@@ -47,7 +45,31 @@ static wxStandardPaths gs_stdPaths;
 /* static */
 wxStandardPathsBase& wxStandardPathsBase::Get()
 {
-    return wxTheApp->GetTraits()->GetStandardPaths();
+    wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    wxCHECK_MSG( traits, gs_stdPaths, _T("create wxApp before calling this") );
+
+    return traits->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();
 }
 
 wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()
@@ -70,12 +92,23 @@ wxString wxStandardPathsBase::GetUserLocalDataDir() const
     return GetUserDataDir();
 }
 
+wxString wxStandardPathsBase::GetDocumentsDir() const
+{
+    return wxFileName::GetHomeDir();
+}
+
+// return the temporary directory for the current user
+wxString wxStandardPathsBase::GetTempDir() const
+{
+    return wxFileName::GetTempDir();
+}
+
 /* static */
 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();
@@ -91,5 +124,3 @@ wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
 
     return subdir;
 }
-
-#endif // wxUSE_STDPATHS