Eliminated two unneeded arguments from wxPropertyGrid::DoDrawItems()

[wxWidgets.git] / src / unix / stdpaths.cpp

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index cce3dc9eb1fcf29edd37d8ceac507e7128110b05..3749968cc92c782923da954171b8ce2aa55053f9 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -26,13 +26,16 @@
 
 #if wxUSE_STDPATHS
 
+#include "wx/stdpaths.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/app.h"
+    #include "wx/wxcrt.h"
+    #include "wx/utils.h"
 #endif //WX_PRECOMP
 
 #include "wx/filename.h"
-
-#include "wx/stdpaths.h"
+#include "wx/log.h"
+#include "wx/textfile.h"
 
 #if defined( __LINUX__ ) || defined( __VMS )
     #include <unistd.h>
@@ -52,6 +55,7 @@ wxString wxStandardPaths::GetUserConfigDir() const
     return wxFileName::GetHomeDir();
 }
 
+
 // ============================================================================
 // wxStandardPaths implementation for VMS
 // ============================================================================
@@ -62,7 +66,7 @@ wxString wxStandardPaths::GetInstallPrefix() const
 {
     if ( m_prefix.empty() )
     {
-        wx_const_cast(wxStandardPaths *, this)->m_prefix = wxT("/sys$system");
+        const_cast<wxStandardPaths *>(this)->m_prefix = wxT("/sys$system");
     }
 
     return m_prefix;
@@ -75,12 +79,12 @@ wxString wxStandardPaths::GetConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
-   return AppendAppName(GetInstallPrefix() + _T("/sys$share"));
+   return AppendAppInfo(GetInstallPrefix() + _T("/sys$share"));
 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {
-   return AppendAppName(_T("/sys$manager"));
+   return AppendAppInfo(_T("/sys$manager"));
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
@@ -94,23 +98,26 @@ wxString wxStandardPaths::GetPluginsDir() const
 }
 
 wxString
-wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
+wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang,
                                           ResourceCat category) const
 {
     return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
 }
 
+wxString wxStandardPaths::GetExecutablePath() const
+{
+    return wxStandardPathsBase::GetExecutablePath();
+}
+
 #else // !__VMS
 
 // ============================================================================
 // wxStandardPaths implementation for Unix
 // ============================================================================
 
-void wxStandardPaths::DetectPrefix()
+wxString wxStandardPaths::GetExecutablePath() const
 {
 #ifdef __LINUX__
-    // under Linux, we can try to infer the prefix from the location of the
-    // executable
     wxString exeStr;
 
     char buf[4096];
@@ -137,6 +144,17 @@ void wxStandardPaths::DetectPrefix()
         wxGetEnv(wxT("   "), &exeStr);
     }
 
+    if ( !exeStr.empty() )
+        return exeStr;
+#endif // __LINUX__
+
+    return wxStandardPathsBase::GetExecutablePath();
+}
+
+void wxStandardPaths::DetectPrefix()
+{
+    // we can try to infer the prefix from the location of the executable
+    wxString exeStr = GetExecutablePath();
     if ( !exeStr.empty() )
     {
         // consider that we're in the last "bin" subdirectory of our prefix
@@ -144,7 +162,6 @@ void wxStandardPaths::DetectPrefix()
         if ( pos != wxString::npos )
             m_prefix.assign(exeStr, 0, pos);
     }
-#endif // __LINUX__
 
     if ( m_prefix.empty() )
     {
@@ -156,7 +173,7 @@ wxString wxStandardPaths::GetInstallPrefix() const
 {
     if ( m_prefix.empty() )
     {
-        wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this);
+        wxStandardPaths *pathPtr = const_cast<wxStandardPaths *>(this);
         pathPtr->DetectPrefix();
     }
 
@@ -174,26 +191,26 @@ wxString wxStandardPaths::GetConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
-   return AppendAppName(GetInstallPrefix() + _T("/share"));
+   return AppendAppInfo(GetInstallPrefix() + _T("/share"));
 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {
-   return AppendAppName(_T("/etc"));
+   return AppendAppInfo(_T("/etc"));
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
-   return AppendAppName(wxFileName::GetHomeDir() + _T("/."));
+   return AppendAppInfo(wxFileName::GetHomeDir() + _T("/."));
 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 {
-    return AppendAppName(GetInstallPrefix() + _T("/lib"));
+    return AppendAppInfo(GetInstallPrefix() + _T("/lib"));
 }
 
 wxString
-wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
+wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang,
                                           ResourceCat category) const
 {
     if ( category != ResourceCat_Messages )
@@ -202,6 +219,46 @@ wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
     return GetInstallPrefix() + _T("/share/locale/") + lang + _T("/LC_MESSAGES");
 }
 
+wxString wxStandardPaths::GetDocumentsDir() const
+{
+    {
+        wxLogNull logNull;
+        wxString homeDir = wxFileName::GetHomeDir();
+        wxString configPath;
+        if (wxGetenv(wxT("XDG_CONFIG_HOME")))
+            configPath = wxGetenv(wxT("XDG_CONFIG_HOME"));
+        else
+            configPath = homeDir + wxT("/.config");
+        wxString dirsFile = configPath + wxT("/user-dirs.dirs");
+        if (wxFileExists(dirsFile))
+        {
+            wxTextFile textFile;
+            if (textFile.Open(dirsFile))
+            {
+                size_t i;
+                for (i = 0; i < textFile.GetLineCount(); i++)
+                {
+                    wxString line(textFile[i]);
+                    int pos = line.Find(wxT("XDG_DOCUMENTS_DIR"));
+                    if (pos != wxNOT_FOUND)
+                    {
+                        wxString value = line.AfterFirst(wxT('='));
+                        value.Replace(wxT("$HOME"), homeDir);
+                        value.Trim(true);
+                        value.Trim(false);
+                        if (!value.IsEmpty() && wxDirExists(value))
+                            return value;
+                        else
+                            break;
+                    }
+                }
+            }
+        }
+    }
+
+    return wxStandardPathsBase::GetDocumentsDir();
+}
+
 #endif // __VMS/!__VMS
 
 #endif // wxUSE_STDPATHS