Update wxWebFileHandler to handle paths with fragments correctly, some backends pass...

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

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index c127fc3d665611b43b1fd5b83b959b467a14dec4..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,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


@@ -196,7 +197,11 @@ wxString wxStandardPaths::GetDataDir() const
     // practice for running well-written (and so using wxStandardPaths to find
     // their files) wx applications without installing them
     static const wxString
     // 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"));
+      envOverride(
+        getenv(
+            ("WX_" + wxTheApp->GetAppName().Upper() + "_DATA_DIR").c_str()
+        )
+      );

 
     if ( !envOverride.empty() )
         return envOverride;
 
     if ( !envOverride.empty() )
         return envOverride;