From f45f43cad09959e02cdb61b5468226357eb033d3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 18 Sep 2012 00:03:45 +0000 Subject: [PATCH] Fix wxMSW compilation in STL build after the changes of r72472, Call t_str() to explicitly convert wxString to wxChar* as implicit conversion is not available in STL build. Closes #14666. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/translation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/translation.cpp b/src/common/translation.cpp index 0aea6979b3..d5022c9ac6 100644 --- a/src/common/translation.cpp +++ b/src/common/translation.cpp @@ -1950,7 +1950,7 @@ wxMsgCatalog *wxResourceTranslationsLoader::LoadCatalog(const wxString& domain, if ( !wxLoadUserResource(&mo_data, &mo_size, resname, - GetResourceType(), + GetResourceType().t_str(), GetModule()) ) return NULL; -- 2.45.2