Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid unnecessary conversions when loading the catalog (i.e. if the catalog encoding is the same as the currently used one)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-18 14:48:17 +00:00
parent 6ba5438dda
commit 7cb0687287
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/intl.cpp
View File

@@ -1219,6 +1219,19 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
const wxString& msgIdCharset, const wxString& msgIdCharset,
bool convertEncoding) const bool convertEncoding) const
{ {
#if wxUSE_FONTMAP
// determine if we need any conversion at all
if ( convertEncoding )
{
wxFontEncoding encCat = wxFontMapperBase::GetEncodingFromName(m_charset);
if ( encCat == wxLocale::GetSystemEncoding() )
{
// no need to convert
convertEncoding = false;
}
}
#endif // wxUSE_FONTMAP
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
wxCSConv *csConv = NULL; wxCSConv *csConv = NULL;
if ( !m_charset.empty() ) if ( !m_charset.empty() )