]> git.saurik.com Git - wxWidgets.git/commitdiff
Compilation fix for STL build.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 10 Oct 2009 18:28:34 +0000 (18:28 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 10 Oct 2009 18:28:34 +0000 (18:28 +0000)
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

index 4089a9e06eb917a8f5a3467e833ebfff79e64ba6..64ac00cc22456b5f72e946dde490b562161aa105 100644 (file)
@@ -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;