Moved print dialog data conversion code

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index d3823ead815d958aeee1071ba08656eaad8d587c..11c6340293b796683170c1b188d6dccb80e05aa7 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1119,8 +1119,8 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
   if ( !fileMsg.IsOpened() )
     return false;
 
-  // get the file size
-  off_t nSize = fileMsg.Length();
+  // get the file size (assume it is less than 4Gb...)
+  size_t nSize = fileMsg.Length();
   if ( nSize == wxInvalidOffset )
     return false;
 
@@ -1132,7 +1132,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
   }
 
   // examine header
-  bool bValid = (size_t)nSize > sizeof(wxMsgCatalogHeader);
+  bool bValid = nSize > sizeof(wxMsgCatalogHeader);
 
   wxMsgCatalogHeader *pHeader = (wxMsgCatalogHeader *)m_pData;
   if ( bValid ) {
@@ -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);