make it possible to restart timer with a simple Start(), as in other ports

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 470c5d12bb9ec7cc09c6027b015208fe76d60bee..b32ce87d3de939ae3714000e4cb77705d2e16863 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1215,7 +1215,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
     if ( convertEncoding )
     {
         wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM;
-        wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(charset, FALSE);
+        wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(m_charset, FALSE);
         if ( enc == wxFONTENCODING_SYSTEM )
         {
             convertEncoding = FALSE; // unknown encoding
@@ -2420,14 +2420,14 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString,
             if ( szDomain != NULL )
             {
                 wxLogTrace(_T("i18n"),
-                           _T("string '%s'[%d] not found in domain '%s' for locale '%s'."),
+                           _T("string '%s'[%ld] not found in domain '%s' for locale '%s'."),
                            szOrigString, n, szDomain, m_strLocale.c_str());
 
             }
             else
             {
                 wxLogTrace(_T("i18n"),
-                           _T("string '%s'[%d] not found in locale '%s'."),
+                           _T("string '%s'[%ld] not found in locale '%s'."),
                            szOrigString, n, m_strLocale.c_str());
             }
         }