]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix wxMSW compilation in STL build after the changes of r72472,
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 18 Sep 2012 00:03:45 +0000 (00:03 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 18 Sep 2012 00:03:45 +0000 (00:03 +0000)
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

index 0aea6979b31ada43c992ba1aca4a10fb0c759c27..d5022c9ac6250d52367aacbcee5c3138ee71bad5 100644 (file)
@@ -1950,7 +1950,7 @@ wxMsgCatalog *wxResourceTranslationsLoader::LoadCatalog(const wxString& domain,
 
     if ( !wxLoadUserResource(&mo_data, &mo_size,
                              resname,
 
     if ( !wxLoadUserResource(&mo_data, &mo_size,
                              resname,
-                             GetResourceType(),
+                             GetResourceType().t_str(),
                              GetModule()) )
         return NULL;
 
                              GetModule()) )
         return NULL;