Applied patch [ 1428990 ] wxUniv: patch for toolbar button remain in pressed status

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 05dfb36282cf669a983809b6ec1edf3e11e94923..459f3189d6253e235eca93a5c02d37d87ea0c990 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1137,7 +1137,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
     return false;
 
   size_t nSize = wx_truncate_cast(size_t, lenFile);
-  wxASSERT_MSG( nSize == lenFile, _T("message catalog bigger than 4GB?") );
+  wxASSERT_MSG( nSize == lenFile + size_t(0), _T("message catalog bigger than 4GB?") );
 
   // read the whole file in memory
   m_pData = new size_t8[nSize];
@@ -1317,7 +1317,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
     (void)convertEncoding; // get rid of warnings about unused parameter
 
-    for (size_t i = 0; i < m_numStrings; i++)
+    for (size_t32 i = 0; i < m_numStrings; i++)
     {
         const char *data = StringAtOfs(m_pOrigTable, i);
 #if wxUSE_UNICODE
@@ -1795,13 +1795,14 @@ bool wxLocale::Init(int language, int flags)
         return false;
     }
 #else
+    wxUnusedVar(flags);
     return false;
     #define WX_NO_LOCALE_SUPPORT
 #endif
 
 #ifndef WX_NO_LOCALE_SUPPORT
     wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;
-    bool ret = Init(name, canonical, retloc,
+    bool ret = Init(name, canonical, szLocale,
                     (flags & wxLOCALE_LOAD_DEFAULT) != 0,
                     (flags & wxLOCALE_CONV_ENCODING) != 0);
     free(szLocale);
@@ -1810,7 +1811,7 @@ bool wxLocale::Init(int language, int flags)
         m_language = lang;
 
     return ret;
-#endif
+#endif // !WX_NO_LOCALE_SUPPORT
 }