avoid unnecessary conversions when loading the catalog (i.e. if the catalog encoding...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 1f360d9a5a4d7c3c966ea1c6cd52ae6a7bb2d753..fd08730d8e3b68969325e797e8b574eadc1d0b99 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1219,6 +1219,19 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
                                 const wxString& msgIdCharset,
                                 bool convertEncoding) const
 {
                                 const wxString& msgIdCharset,
                                 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
     wxCSConv *csConv = NULL;
     if ( !m_charset.empty() )
 #if wxUSE_WCHAR_T
     wxCSConv *csConv = NULL;
     if ( !m_charset.empty() )