1. fixed (?) blitting bitmaps with mask

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 84022468f4779b6e3d307f2dfb18f45977cd218a..81b1ee49428e06b42d250f36f6ee3b6f02a97bc4 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -132,7 +132,7 @@ public:
  ~wxMsgCatalog();
 
   // load the catalog from disk (szDirPrefix corresponds to language)
  ~wxMsgCatalog();
 
   // load the catalog from disk (szDirPrefix corresponds to language)

-  bool Load(const wxChar *szDirPrefix, const wxChar *szName);
+  bool Load(const wxChar *szDirPrefix, const wxChar *szName, bool bConvertEncoding = FALSE);

   bool IsLoaded() const { return m_pData != NULL; }
 
   // get name of the catalog
   bool IsLoaded() const { return m_pData != NULL; }
 
   // get name of the catalog


@@ -179,6 +179,9 @@ private:
   const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 index) const
     { return (const char *)(m_pData + Swap(pTable[index].ofsString)); }
 
   const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 index) const
     { return (const char *)(m_pData + Swap(pTable[index].ofsString)); }
 

+  // convert encoding to platform native one, if neccessary
+  void ConvertEncoding();
+

   // utility functions
     // calculate the hash value of given string
   static inline size_t32 GetHash(const char *sz);
   // utility functions
     // calculate the hash value of given string
   static inline size_t32 GetHash(const char *sz);


@@ -301,7 +304,7 @@ static wxString GetFullSearchPath(const wxChar *lang)
 }
 
 // open disk file and read in it's contents
 }
 
 // open disk file and read in it's contents

-bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName0)
+bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName0, bool bConvertEncoding)

 {
    /* We need to handle locales like  de_AT.iso-8859-1
       For this we first chop off the .CHARSET specifier and ignore it.
 {
    /* We need to handle locales like  de_AT.iso-8859-1
       For this we first chop off the .CHARSET specifier and ignore it.


@@ -402,6 +405,8 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName0)
   m_pszName = new wxChar[wxStrlen(szName) + 1];
   wxStrcpy(m_pszName, szName);
 
   m_pszName = new wxChar[wxStrlen(szName) + 1];
   wxStrcpy(m_pszName, szName);
 

+  if (bConvertEncoding) ConvertEncoding();
+

   // everything is fine
   return TRUE;
 }
   // everything is fine
   return TRUE;
 }


@@ -458,6 +463,53 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
   return NULL;
 }
 
   return NULL;
 }
 

+
+#if wxUSE_GUI
+#include "wx/fontmap.h"
+#include "wx/encconv.h"
+#endif
+
+void wxMsgCatalog::ConvertEncoding()
+{
+#if wxUSE_GUI
+    wxFontEncoding enc;
+
+    // first, find encoding header:
+    const char *hdr = StringAtOfs(m_pOrigTable, 0);
+    if (hdr == NULL) return; // not supported by this catalog, does not have non-fuzzy header
+    if (hdr[0] != 0) return; // ditto
+
+    /* we support catalogs with header (msgid "") that is _not_ marked as "#, fuzzy" (otherwise
+       the string would not be included into compiled catalog) */
+    wxString header(StringAtOfs(m_pTransTable, 0));
+    wxString charset;
+    int pos = header.Find(wxT("Content-Type: text/plain; charset="));
+    if (pos == wxNOT_FOUND)
+        return; // incorrectly filled Content-Type header
+    size_t n = pos + 34; /*strlen("Content-Type: text/plain; charset=")*/
+    while (header[n] != wxT('\n'))
+        charset << header[n++];
+
+    enc = wxTheFontMapper->CharsetToEncoding(charset, FALSE);
+    if ( enc == wxFONTENCODING_SYSTEM )
+        return; // unknown encoding
+
+    wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
+    if (a[0] == enc)
+        return; // no conversion needed, locale uses native encoding
+
+    if (a.GetCount() == 0)
+        return; // we don't know common equiv. under this platform
+
+    wxEncodingConverter converter;
+
+    converter.Init(enc, a[0]);
+    for (size_t i = 0; i < m_numStrings; i++)
+        converter.Convert((char*)StringAtOfs(m_pTransTable, i));
+#endif
+}
+
+

 // ----------------------------------------------------------------------------
 // wxLocale
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxLocale
 // ----------------------------------------------------------------------------


@@ -472,10 +524,12 @@ wxLocale::wxLocale()
 bool wxLocale::Init(const wxChar *szName,
                     const wxChar *szShort,
                     const wxChar *szLocale,
 bool wxLocale::Init(const wxChar *szName,
                     const wxChar *szShort,
                     const wxChar *szLocale,

-                    bool        bLoadDefault)
+                    bool        bLoadDefault,
+                    bool        bConvertEncoding)

 {
   m_strLocale = szName;
   m_strShort = szShort;
 {
   m_strLocale = szName;
   m_strShort = szShort;

+  m_bConvertEncoding = bConvertEncoding;

 
   // change current locale (default: same as long name)
   if ( szLocale == NULL )
 
   // change current locale (default: same as long name)
   if ( szLocale == NULL )


@@ -623,7 +677,7 @@ bool wxLocale::AddCatalog(const wxChar *szDomain)
 {
   wxMsgCatalog *pMsgCat = new wxMsgCatalog;
 
 {
   wxMsgCatalog *pMsgCat = new wxMsgCatalog;
 

-  if ( pMsgCat->Load(m_strShort, szDomain) ) {
+  if ( pMsgCat->Load(m_strShort, szDomain, m_bConvertEncoding) ) {

     // add it to the head of the list so that in GetString it will
     // be searched before the catalogs added earlier
     pMsgCat->m_pNext = m_pMsgCat;
     // add it to the head of the list so that in GetString it will
     // be searched before the catalogs added earlier
     pMsgCat->m_pNext = m_pMsgCat;