From 3781248c7d746259adf2141974707a91130bbd65 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 10 Oct 2009 18:28:34 +0000 Subject: [PATCH] Compilation fix for STL build. Don't rely on implicit conversion of wxString to char* in wxStandardPaths::GetDataDir() added in r62337. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/stdpaths.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp index 4089a9e06e..64ac00cc22 100644 --- a/src/unix/stdpaths.cpp +++ b/src/unix/stdpaths.cpp @@ -197,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 - envOverride(getenv("WX_" + wxTheApp->GetAppName().Upper() + "_DATA_DIR")); + envOverride( + getenv( + ("WX_" + wxTheApp->GetAppName().Upper() + "_DATA_DIR").c_str() + ) + ); if ( !envOverride.empty() ) return envOverride; -- 2.45.2