don't add dummy empty line at the end when reading from stream

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index d3823ead815d958aeee1071ba08656eaad8d587c..4b164126f3f3fedcc9ac09dd1e9b4575b72211a4 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1120,13 +1120,13 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
     return false;
 
   // get the file size
-  off_t nSize = fileMsg.Length();
+  wxFileOffset nSize = fileMsg.Length();
   if ( nSize == wxInvalidOffset )
     return false;
 
   // read the whole file in memory
   m_pData = new size_t8[nSize];
-  if ( fileMsg.Read(m_pData, nSize) != nSize ) {
+  if ( fileMsg.Read(m_pData, nSize) != (size_t)nSize ) {
     wxDELETEA(m_pData);
     return false;
   }
@@ -1479,7 +1479,7 @@ bool wxLocale::Init(const wxChar *szName,
 }
 
 
-#if defined(__UNIX__) && wxUSE_UNICODE
+#if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WXMAC__)
 static wxWCharBuffer wxSetlocaleTryUTF(int c, const wxChar *lc)
 {
     wxMB2WXbuf l = wxSetlocale(c, lc);