use MSWAlwaysDrawBg() to fix the problem with black background; rewrote/cleaned up...

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 7dbd7b0cb37fcfe5452ab05465cf1f5ad9223ab2..70f1a49cec52acdc453abcd63dc9ec4a8331cd23 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1130,7 +1130,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
 
   // read the whole file in memory
   m_pData = new size_t8[nSize];
 
   // read the whole file in memory
   m_pData = new size_t8[nSize];

-  if ( fileMsg.Read(m_pData, nSize) != nSize + (size_t)0 ) {
+  if ( fileMsg.Read(m_pData, (size_t)nSize) != nSize ) {

     wxDELETEA(m_pData);
     return false;
   }
     wxDELETEA(m_pData);
     return false;
   }


@@ -1161,7 +1161,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
                    Swap(pHeader->ofsOrigTable));
   m_pTransTable = (wxMsgTableEntry *)(m_pData +
                    Swap(pHeader->ofsTransTable));
                    Swap(pHeader->ofsOrigTable));
   m_pTransTable = (wxMsgTableEntry *)(m_pData +
                    Swap(pHeader->ofsTransTable));

-  m_nSize = nSize;
+  m_nSize = (size_t32)nSize;

 
   // now parse catalog's header and try to extract catalog charset and
   // plural forms formula from it:
 
   // now parse catalog's header and try to extract catalog charset and
   // plural forms formula from it:


@@ -2185,6 +2185,9 @@ wxString wxLocale::GetSystemEncodingName()
     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();
     encname.Printf(_T("windows-%u"), codepage);
     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();
     encname.Printf(_T("windows-%u"), codepage);

+#elif defined(__WXMAC__)
+    // default is just empty string, this resolves to the default system
+    // encoding later

 #elif defined(__UNIX_LIKE__)
 
 #if defined(HAVE_LANGINFO_H) && defined(CODESET)
 #elif defined(__UNIX_LIKE__)
 
 #if defined(HAVE_LANGINFO_H) && defined(CODESET)