Disable wxUSE_ENH_METAFILE for wxGTK builds.

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

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index a3ff34dff4eb46c2c1f6a6207fe65e4badabf9c3..58f8c2c6706d33ea5eff1bad7654a27392f4e5ef 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        unix/stdpaths.cpp
+// Name:        src/unix/stdpaths.cpp

 // Purpose:     wxStandardPaths implementation for Unix & OpenVMS systems
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Purpose:     wxStandardPaths implementation for Unix & OpenVMS systems
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>

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

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


@@ -29,6 +29,7 @@
 #include "wx/stdpaths.h"
 
 #ifndef WX_PRECOMP
 #include "wx/stdpaths.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/app.h"

     #include "wx/wxcrt.h"
     #include "wx/utils.h"
 #endif //WX_PRECOMP
     #include "wx/wxcrt.h"
     #include "wx/utils.h"
 #endif //WX_PRECOMP


@@ -121,7 +122,7 @@ wxString wxStandardPaths::GetExecutablePath() const
     wxString exeStr;
 
     char buf[4096];
     wxString exeStr;
 
     char buf[4096];

-    int result = readlink("/proc/self/exe", buf, WXSIZEOF(buf) - sizeof(char));
+    int result = readlink("/proc/self/exe", buf, WXSIZEOF(buf) - 1);

     if ( result != -1 )
     {
         buf[result] = '\0'; // readlink() doesn't NUL-terminate the buffer
     if ( result != -1 )
     {
         buf[result] = '\0'; // readlink() doesn't NUL-terminate the buffer


@@ -191,6 +192,20 @@ wxString wxStandardPaths::GetConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
 
 wxString wxStandardPaths::GetDataDir() const
 {

+    // allow to override the location of the data directory by setting
+    // WX_APPNAME_DATA_DIR environment variable: this is very useful in
+    // practice for running well-written (and so using wxStandardPaths to find
+    // their files) wx applications without installing them
+    static const wxString
+      envOverride(
+        getenv(
+            ("WX_" + wxTheApp->GetAppName().Upper() + "_DATA_DIR").c_str()
+        )
+      );
+
+    if ( !envOverride.empty() )
+        return envOverride;
+

    return AppendAppInfo(GetInstallPrefix() + wxT("/share"));
 }
 
    return AppendAppInfo(GetInstallPrefix() + wxT("/share"));
 }