1. added wxEnhMetaFileXXX classes

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 46a21f8bad48e63ea49d235a452b429a6aaec685..81b1ee49428e06b42d250f36f6ee3b6f02a97bc4 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -28,8 +28,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_INTL
+

 // standard headers
 #include  <locale.h>
 // standard headers
 #include  <locale.h>

+#include  <ctype.h>

 
 // wxWindows
 #include "wx/defs.h"
 
 // wxWindows
 #include "wx/defs.h"


@@ -37,6 +40,7 @@
 #include "wx/intl.h"
 #include "wx/file.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/file.h"
 #include "wx/log.h"

+#include "wx/debug.h"

 #include "wx/utils.h"
 
 #include <stdlib.h>
 #include "wx/utils.h"
 
 #include <stdlib.h>


@@ -45,9 +49,44 @@
 // simple types
 // ----------------------------------------------------------------------------
 
 // simple types
 // ----------------------------------------------------------------------------
 

-// FIXME adjust if necessary
+// this should *not* be wxChar, this type must have exactly 8 bits!

 typedef unsigned char size_t8;
 typedef unsigned char size_t8;

-typedef unsigned long size_t32;
+
+#ifdef __WXMSW__
+    #if defined(__WIN16__)
+        typedef unsigned long size_t32;
+    #elif defined(__WIN32__)
+        typedef unsigned int size_t32;
+    #else
+        // Win64 will have different type sizes
+        #error "Please define a 32 bit type"
+    #endif
+#else // !Windows
+    // SIZEOF_XXX are defined by configure
+    #if defined(SIZEOF_INT) && (SIZEOF_INT == 4)
+        typedef unsigned int size_t32;
+    #elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 4)
+        typedef unsigned long size_t32;
+    #else
+        // assume sizeof(int) == 4 - what else can we do
+        typedef unsigned int size_t32;
+
+        // ... but at least check it during run time
+        static class IntSizeChecker
+        {
+        public:
+            IntSizeChecker()
+            {
+                // Asserting a sizeof directly causes some compilers to
+                // issue a "using constant in a conditional expression" warning
+                size_t                   intsize = sizeof(int);
+
+                wxASSERT_MSG( intsize == 4,
+                              "size_t32 is incorrectly defined!" );
+            }
+        } intsizechecker;
+    #endif
+#endif // Win/!Win

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -93,11 +132,11 @@ public:
  ~wxMsgCatalog();
 
   // load the catalog from disk (szDirPrefix corresponds to language)
  ~wxMsgCatalog();
 
   // load the catalog from disk (szDirPrefix corresponds to language)

-  bool Load(const char *szDirPrefix, const char *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

-  const char *GetName() const { return m_pszName; }
+  const wxChar *GetName() const { return m_pszName; }

 
   // get the translated string: returns NULL if not found
   const char *GetString(const char *sz) const;
 
   // get the translated string: returns NULL if not found
   const char *GetString(const char *sz) const;


@@ -140,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);


@@ -152,7 +194,7 @@ private:
 
   bool          m_bSwapped;   // wrong endianness?
 
 
   bool          m_bSwapped;   // wrong endianness?
 

-  char         *m_pszName;    // name of the domain
+  wxChar       *m_pszName;    // name of the domain

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -220,15 +262,15 @@ public:
 };
 
 // return all directories to search for given prefix
 };
 
 // return all directories to search for given prefix

-static wxString GetAllMsgCatalogSubdirs(const char *prefix,
-                                        const char *lang)
+static wxString GetAllMsgCatalogSubdirs(const wxChar *prefix,
+                                        const wxChar *lang)

 {
     wxString searchPath;
 
     // search first in prefix/fr/LC_MESSAGES, then in prefix/fr and finally in
     // prefix (assuming the language is 'fr')
     searchPath << prefix << wxFILE_SEP_PATH << lang << wxFILE_SEP_PATH
 {
     wxString searchPath;
 
     // search first in prefix/fr/LC_MESSAGES, then in prefix/fr and finally in
     // prefix (assuming the language is 'fr')
     searchPath << prefix << wxFILE_SEP_PATH << lang << wxFILE_SEP_PATH

-                         << "LC_MESSAGES" << wxPATH_SEP
+                         << wxT("LC_MESSAGES") << wxPATH_SEP

                << prefix << wxFILE_SEP_PATH << lang << wxPATH_SEP
                << prefix << wxPATH_SEP;
 
                << prefix << wxFILE_SEP_PATH << lang << wxPATH_SEP
                << prefix << wxPATH_SEP;
 


@@ -236,7 +278,7 @@ static wxString GetAllMsgCatalogSubdirs(const char *prefix,
 }
 
 // construct the search path for the given language
 }
 
 // construct the search path for the given language

-static wxString GetFullSearchPath(const char *lang)
+static wxString GetFullSearchPath(const wxChar *lang)

 {
     wxString searchPath;
 
 {
     wxString searchPath;
 


@@ -250,29 +292,38 @@ static wxString GetFullSearchPath(const char *lang)
 
     // then take the current directory
     // FIXME it should be the directory of the executable
 
     // then take the current directory
     // FIXME it should be the directory of the executable

-    searchPath << GetAllMsgCatalogSubdirs(".", lang) << wxPATH_SEP;
+    searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang) << wxPATH_SEP;

 
     // and finally add some standard ones
     searchPath
 
     // and finally add some standard ones
     searchPath

-        << GetAllMsgCatalogSubdirs("/usr/share/locale", lang) << wxPATH_SEP
-        << GetAllMsgCatalogSubdirs("/usr/lib/locale", lang) << wxPATH_SEP
-        << GetAllMsgCatalogSubdirs("/usr/local/share/locale", lang);
+        << GetAllMsgCatalogSubdirs(wxT("/usr/share/locale"), lang) << wxPATH_SEP
+        << GetAllMsgCatalogSubdirs(wxT("/usr/lib/locale"), lang) << wxPATH_SEP
+        << GetAllMsgCatalogSubdirs(wxT("/usr/local/share/locale"), lang);

 
     return searchPath;
 }
 
 // open disk file and read in it's contents
 
     return searchPath;
 }
 
 // open disk file and read in it's contents

-bool wxMsgCatalog::Load(const char *szDirPrefix, const char *szName)
+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.
+      FIXME: UNICODE SUPPORT: must use CHARSET specifier!
+   */
+   wxString szName = szName0;
+   if(szName.Find(wxT('.')) != -1) // contains a dot
+      szName = szName.Left(szName.Find(wxT('.')));
+

   // FIXME VZ: I forgot the exact meaning of LC_PATH - anyone to remind me?
   // FIXME VZ: I forgot the exact meaning of LC_PATH - anyone to remind me?

+  // KB: search path where to find the mo files, probably : delimited

 #if 0
 #if 0

-  const char *pszLcPath = getenv("LC_PATH");
+  const wxChar *pszLcPath = wxGetenv("LC_PATH");

   if ( pszLcPath != NULL )
       strPath += pszLcPath + wxString(szDirPrefix) + MSG_PATH;
 #endif // 0
 
   wxString searchPath = GetFullSearchPath(szDirPrefix);
   if ( pszLcPath != NULL )
       strPath += pszLcPath + wxString(szDirPrefix) + MSG_PATH;
 #endif // 0
 
   wxString searchPath = GetFullSearchPath(szDirPrefix);

-  const char *sublocale = strchr(szDirPrefix, '_');
+  const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_'));

   if ( sublocale )
   {
       // also add just base locale name: for things like "fr_BE" (belgium
   if ( sublocale )
   {
       // also add just base locale name: for things like "fr_BE" (belgium


@@ -290,20 +341,20 @@ bool wxMsgCatalog::Load(const char *szDirPrefix, const char *szName)
   // not yet be loaded (and it's normal)
   //
   // (we're using an object because we have several return paths)
   // not yet be loaded (and it's normal)
   //
   // (we're using an object because we have several return paths)

-  NoTransErr noTransErr;

 
 

-  wxLogVerbose(_("looking for catalog '%s' in path '%s'."),
-               szName, searchPath.c_str());
+  NoTransErr noTransErr;
+  wxLogVerbose(wxT("looking for catalog '%s' in path '%s'."),
+               szName.c_str(), searchPath.c_str());

 
   wxString strFullName;
   if ( !wxFindFileInPath(&strFullName, searchPath, strFile) ) {
 
   wxString strFullName;
   if ( !wxFindFileInPath(&strFullName, searchPath, strFile) ) {

-    wxLogWarning(_("catalog file for domain '%s' not found."), szName);
+    wxLogWarning(_("catalog file for domain '%s' not found."), szName.c_str());

     return FALSE;
   }
 
   // open file
   wxLogVerbose(_("using catalog '%s' from '%s'."),
     return FALSE;
   }
 
   // open file
   wxLogVerbose(_("using catalog '%s' from '%s'."),

-             szName, strFullName.c_str());
+             szName.c_str(), strFullName.c_str());

 
   wxFile fileMsg(strFullName);
   if ( !fileMsg.IsOpened() )
 
   wxFile fileMsg(strFullName);
   if ( !fileMsg.IsOpened() )


@@ -351,8 +402,10 @@ bool wxMsgCatalog::Load(const char *szDirPrefix, const char *szName)
   m_nHashSize   = Swap(pHeader->nHashSize);
   m_pHashTable  = (size_t32 *)(m_pData + Swap(pHeader->ofsHashTable));
 
   m_nHashSize   = Swap(pHeader->nHashSize);
   m_pHashTable  = (size_t32 *)(m_pData + Swap(pHeader->ofsHashTable));
 

-  m_pszName = new char[strlen(szName) + 1];
-  strcpy(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;


@@ -370,7 +423,13 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
 
     size_t32 nIncr = 1 + (nHashVal % (m_nHashSize - 2));
 
 
     size_t32 nIncr = 1 + (nHashVal % (m_nHashSize - 2));
 

-    while ( TRUE ) {
+#if defined(__VISAGECPP__)
+// VA just can't stand while(1) or while(TRUE)
+    bool bOs2var = TRUE;
+    while(bOs2var) {
+#else
+    while (1) {
+#endif

       size_t32 nStr = Swap(m_pHashTable[nIndex]);
       if ( nStr == 0 )
         return NULL;
       size_t32 nStr = Swap(m_pHashTable[nIndex]);
       if ( nStr == 0 )
         return NULL;


@@ -404,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
 // ----------------------------------------------------------------------------


@@ -415,18 +521,23 @@ wxLocale::wxLocale()
 }
 
 // NB: this function has (desired) side effect of changing current locale
 }
 
 // NB: this function has (desired) side effect of changing current locale

-bool wxLocale::Init(const char *szName,
-                    const char *szShort,
-                    const char *szLocale,
-                    bool        bLoadDefault)
+bool wxLocale::Init(const wxChar *szName,
+                    const wxChar *szShort,
+                    const wxChar *szLocale,
+                    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 )

-    szLocale = szName;
-  m_pszOldLocale = setlocale(LC_ALL, szLocale);
+  {
+    // the argument to setlocale()
+    szLocale = szShort;
+  }
+  m_pszOldLocale = wxSetlocale(LC_ALL, szLocale);

   if ( m_pszOldLocale == NULL )
     wxLogError(_("locale '%s' can not be set."), szLocale);
 
   if ( m_pszOldLocale == NULL )
     wxLogError(_("locale '%s' can not be set."), szLocale);
 


@@ -435,7 +546,7 @@ bool wxLocale::Init(const char *szName,
   if ( m_strShort.IsEmpty() ) {
     // FIXME I don't know how these 2 letter abbreviations are formed,
     //       this wild guess is surely wrong
   if ( m_strShort.IsEmpty() ) {
     // FIXME I don't know how these 2 letter abbreviations are formed,
     //       this wild guess is surely wrong

-    m_strShort = wxToLower(szLocale[0]) + wxToLower(szLocale[1]);
+    m_strShort = tolower(szLocale[0]) + tolower(szLocale[1]);

   }
 
   // save the old locale to be able to restore it later
   }
 
   // save the old locale to be able to restore it later


@@ -445,7 +556,7 @@ bool wxLocale::Init(const char *szName,
   m_pMsgCat = NULL;
   bool bOk = TRUE;
   if ( bLoadDefault )
   m_pMsgCat = NULL;
   bool bOk = TRUE;
   if ( bLoadDefault )

-    bOk = AddCatalog("wxstd");
+    bOk = AddCatalog(wxT("wxstd"));

 
   return bOk;
 }
 
   return bOk;
 }


@@ -472,16 +583,22 @@ wxLocale::~wxLocale()
 
     // restore old locale
     wxSetLocale(m_pOldLocale);
 
     // restore old locale
     wxSetLocale(m_pOldLocale);

-    setlocale(LC_ALL, m_pszOldLocale);
+    wxSetlocale(LC_ALL, m_pszOldLocale);

 }
 
 // get the translation of given string in current locale
 }
 
 // get the translation of given string in current locale

-const char *wxLocale::GetString(const char *szOrigString,
-                                const char *szDomain) const
+const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
+                                     const wxChar *szDomain) const

 {
 {

-  wxASSERT( szOrigString != NULL ); // would be pretty silly
+  if ( wxIsEmpty(szOrigString) )
+      return szDomain;

 
   const char *pszTrans = NULL;
 
   const char *pszTrans = NULL;

+#if wxUSE_UNICODE
+  const wxWX2MBbuf szOrgString = wxConvCurrent->cWX2MB(szOrigString);
+#else // ANSI
+  #define szOrgString szOrigString
+#endif // Unicode/ANSI

 
   wxMsgCatalog *pMsgCat;
   if ( szDomain != NULL ) {
 
   wxMsgCatalog *pMsgCat;
   if ( szDomain != NULL ) {


@@ -489,12 +606,12 @@ const char *wxLocale::GetString(const char *szOrigString,
 
     // does the catalog exist?
     if ( pMsgCat != NULL )
 
     // does the catalog exist?
     if ( pMsgCat != NULL )

-      pszTrans = pMsgCat->GetString(szOrigString);
+      pszTrans = pMsgCat->GetString(szOrgString);

   }
   else {
     // search in all domains
     for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) {
   }
   else {
     // search in all domains
     for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) {

-      pszTrans = pMsgCat->GetString(szOrigString);
+      pszTrans = pMsgCat->GetString(szOrgString);

       if ( pszTrans != NULL )   // take the first found
         break;
     }
       if ( pszTrans != NULL )   // take the first found
         break;
     }


@@ -525,19 +642,24 @@ const char *wxLocale::GetString(const char *szOrigString,
       }
     }
 
       }
     }
 

-    return szOrigString;
+    return (wxMB2WXbuf)(szOrigString);

   }
   else
   }
   else

-    return pszTrans;
+  {
+    return wxConvertMB2WX(pszTrans); // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something,
+                                     // a macro similar to wxConvertMB2WX could be written for that
+  }
+
+  #undef szOrgString

 }
 
 // find catalog by name in a linked list, return NULL if !found
 }
 
 // find catalog by name in a linked list, return NULL if !found

-wxMsgCatalog *wxLocale::FindCatalog(const char *szDomain) const
+wxMsgCatalog *wxLocale::FindCatalog(const wxChar *szDomain) const

 {
 // linear search in the linked list
   wxMsgCatalog *pMsgCat;
   for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) {
 {
 // linear search in the linked list
   wxMsgCatalog *pMsgCat;
   for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) {

-    if ( Stricmp(pMsgCat->GetName(), szDomain) == 0 )
+    if ( wxStricmp(pMsgCat->GetName(), szDomain) == 0 )

       return pMsgCat;
   }
 
       return pMsgCat;
   }
 


@@ -545,17 +667,17 @@ wxMsgCatalog *wxLocale::FindCatalog(const char *szDomain) const
 }
 
 // check if the given catalog is loaded
 }
 
 // check if the given catalog is loaded

-bool wxLocale::IsLoaded(const char *szDomain) const
+bool wxLocale::IsLoaded(const wxChar *szDomain) const

 {
   return FindCatalog(szDomain) != NULL;
 }
 
 // add a catalog to our linked list
 {
   return FindCatalog(szDomain) != NULL;
 }
 
 // add a catalog to our linked list

-bool wxLocale::AddCatalog(const char *szDomain)
+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;


@@ -612,3 +734,6 @@ wxLocale *wxSetLocale(wxLocale *pLocale)
   g_pLocale = pLocale;
   return pOld;
 }
   g_pLocale = pLocale;
   return pOld;
 }

+
+#endif // wxUSE_INTL
+