no changes, just refactor the code sending spin update event to SendSpinUpdate()...

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

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index cce3dc9eb1fcf29edd37d8ceac507e7128110b05..e81f673d205d792e4cf75ab64d8eb1dba17683b1 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -26,14 +26,14 @@
 
 #if wxUSE_STDPATHS
 
 
 #if wxUSE_STDPATHS
 

+#include "wx/stdpaths.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/app.h"
+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 
 #include "wx/filename.h"
 
 #endif //WX_PRECOMP
 
 #include "wx/filename.h"
 

-#include "wx/stdpaths.h"
-

 #if defined( __LINUX__ ) || defined( __VMS )
     #include <unistd.h>
 #endif
 #if defined( __LINUX__ ) || defined( __VMS )
     #include <unistd.h>
 #endif


@@ -100,17 +100,20 @@ wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
     return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
 }
 
     return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
 }
 

+wxString wxStandardPaths::GetExecutablePath() const
+{
+    return wxStandardPathsBase::GetExecutablePath();
+}
+

 #else // !__VMS
 
 // ============================================================================
 // wxStandardPaths implementation for Unix
 // ============================================================================
 
 #else // !__VMS
 
 // ============================================================================
 // wxStandardPaths implementation for Unix
 // ============================================================================
 

-void wxStandardPaths::DetectPrefix()
+wxString wxStandardPaths::GetExecutablePath() const

 {
 #ifdef __LINUX__
 {
 #ifdef __LINUX__

-    // under Linux, we can try to infer the prefix from the location of the
-    // executable

     wxString exeStr;
 
     char buf[4096];
     wxString exeStr;
 
     char buf[4096];


@@ -137,6 +140,17 @@ void wxStandardPaths::DetectPrefix()
         wxGetEnv(wxT("   "), &exeStr);
     }
 
         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
     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);
     }
         if ( pos != wxString::npos )
             m_prefix.assign(exeStr, 0, pos);
     }

-#endif // __LINUX__

 
     if ( m_prefix.empty() )
     {
 
     if ( m_prefix.empty() )
     {