Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index 530d7fe918a1ed83a9d1bbf888cdef90f97403e1..d65bb8dd7fa687b2bd2c6bd626f681bc7fc9c316 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,8 @@
 #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/utils.h"
 #endif //WX_PRECOMP
 


@@ -65,7 +67,7 @@ wxString wxStandardPaths::GetInstallPrefix() const
 {
     if ( m_prefix.empty() )
     {
 {
     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;
     }
 
     return m_prefix;


@@ -73,17 +75,17 @@ wxString wxStandardPaths::GetInstallPrefix() const
 
 wxString wxStandardPaths::GetConfigDir() const
 {
 
 wxString wxStandardPaths::GetConfigDir() const
 {

-   return _T("/sys$manager");
+   return wxT("/sys$manager");

 }
 
 wxString wxStandardPaths::GetDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetDataDir() const
 {

-   return AppendAppInfo(GetInstallPrefix() + _T("/sys$share"));
+   return AppendAppInfo(GetInstallPrefix() + wxT("/sys$share"));

 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {

-   return AppendAppInfo(_T("/sys$manager"));
+   return AppendAppInfo(wxT("/sys$manager"));

 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 }
 
 wxString wxStandardPaths::GetUserDataDir() const


@@ -172,7 +174,7 @@ wxString wxStandardPaths::GetInstallPrefix() const
 {
     if ( m_prefix.empty() )
     {
 {
     if ( m_prefix.empty() )
     {

-        wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this);
+        wxStandardPaths *pathPtr = const_cast<wxStandardPaths *>(this);

         pathPtr->DetectPrefix();
     }
 
         pathPtr->DetectPrefix();
     }
 


@@ -185,27 +187,41 @@ wxString wxStandardPaths::GetInstallPrefix() const
 
 wxString wxStandardPaths::GetConfigDir() const
 {
 
 wxString wxStandardPaths::GetConfigDir() const
 {

-   return _T("/etc");
+   return wxT("/etc");

 }
 
 wxString wxStandardPaths::GetDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetDataDir() const
 {

-   return AppendAppInfo(GetInstallPrefix() + _T("/share"));
+    // 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"));

 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {

-   return AppendAppInfo(_T("/etc"));
+   return AppendAppInfo(wxT("/etc"));

 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {

-   return AppendAppInfo(wxFileName::GetHomeDir() + _T("/."));
+   return AppendAppInfo(wxFileName::GetHomeDir() + wxT("/."));

 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 {
 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 {

-    return AppendAppInfo(GetInstallPrefix() + _T("/lib"));
+    return AppendAppInfo(GetInstallPrefix() + wxT("/lib"));

 }
 
 wxString
 }
 
 wxString


@@ -215,7 +231,7 @@ wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang,
     if ( category != ResourceCat_Messages )
         return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
 
     if ( category != ResourceCat_Messages )
         return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
 

-    return GetInstallPrefix() + _T("/share/locale/") + lang + _T("/LC_MESSAGES");
+    return GetInstallPrefix() + wxT("/share/locale/") + lang + wxT("/LC_MESSAGES");

 }
 
 wxString wxStandardPaths::GetDocumentsDir() const
 }
 
 wxString wxStandardPaths::GetDocumentsDir() const