X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab9f9e7136e3300ddd01a1ae6c3861fa3d5656c0..3d63133a5ef146494fa821c76c705e535990086a:/src/unix/stdpaths.cpp

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index 06a2e30781..e81f673d20 100644
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -100,17 +100,20 @@ wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
     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 +140,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 +158,6 @@ void wxStandardPaths::DetectPrefix()
         if ( pos != wxString::npos )
             m_prefix.assign(exeStr, 0, pos);
     }
-#endif // __LINUX__
 
     if ( m_prefix.empty() )
     {