don't return wxLIST_HITTEST_ONITEMICON from HitTest() when the muse is clicked to...

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 2edc031e3129da45628239f65a8c2257d3abaa0a..11c6340293b796683170c1b188d6dccb80e05aa7 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1119,20 +1119,20 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
   if ( !fileMsg.IsOpened() )
     return false;
 
-  // get the file size
-  wxFileOffset nSize = fileMsg.Length();
+  // get the file size (assume it is less than 4Gb...)
+  size_t 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, (size_t)nSize) != (size_t)nSize ) {
+  if ( fileMsg.Read(m_pData, nSize) != nSize ) {
     wxDELETEA(m_pData);
     return false;
   }
 
   // examine header
-  bool bValid = (size_t)nSize > sizeof(wxMsgCatalogHeader);
+  bool bValid = nSize > sizeof(wxMsgCatalogHeader);
 
   wxMsgCatalogHeader *pHeader = (wxMsgCatalogHeader *)m_pData;
   if ( bValid ) {
@@ -1157,7 +1157,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
                    Swap(pHeader->ofsOrigTable));
   m_pTransTable = (wxMsgTableEntry *)(m_pData +
                    Swap(pHeader->ofsTransTable));
-  m_nSize = (size_t)nSize;
+  m_nSize = nSize;
 
   // now parse catalog's header and try to extract catalog charset and
   // plural forms formula from it: