#pragma hdrstop
#endif
+#if wxUSE_INTL
+
// standard headers
#include <locale.h>
#include <ctype.h>
#include "wx/intl.h"
#include "wx/file.h"
#include "wx/log.h"
+#include "wx/debug.h"
#include "wx/utils.h"
#include <stdlib.h>
// 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 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
~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 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;
bool m_bSwapped; // wrong endianness?
- char *m_pszName; // name of the domain
+ wxChar *m_pszName; // name of the domain
};
// ----------------------------------------------------------------------------
};
// 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
- << "LC_MESSAGES" << wxPATH_SEP
+ << T("LC_MESSAGES") << wxPATH_SEP
<< prefix << wxFILE_SEP_PATH << lang << wxPATH_SEP
<< prefix << wxPATH_SEP;
}
// construct the search path for the given language
-static wxString GetFullSearchPath(const char *lang)
+static wxString GetFullSearchPath(const wxChar *lang)
{
wxString searchPath;
// then take the current directory
// FIXME it should be the directory of the executable
- searchPath << GetAllMsgCatalogSubdirs(".", lang) << wxPATH_SEP;
+ searchPath << GetAllMsgCatalogSubdirs(T("."), lang) << wxPATH_SEP;
// 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(T("/usr/share/locale"), lang) << wxPATH_SEP
+ << GetAllMsgCatalogSubdirs(T("/usr/lib/locale"), lang) << wxPATH_SEP
+ << GetAllMsgCatalogSubdirs(T("/usr/local/share/locale"), lang);
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)
{
+ /* 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('.') != -1) // contains a dot
+ szName = szName.Left(szName.Find('.'));
+
// 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
- 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);
- const char *sublocale = strchr(szDirPrefix, '_');
+ const wxChar *sublocale = wxStrchr(szDirPrefix, T('_'));
if ( sublocale )
{
// also add just base locale name: for things like "fr_BE" (belgium
// 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(T("looking for catalog '%s' in path '%s'."),
+ szName.c_str(), searchPath.c_str());
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'."),
- szName, strFullName.c_str());
+ szName.c_str(), strFullName.c_str());
wxFile fileMsg(strFullName);
if ( !fileMsg.IsOpened() )
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);
// everything is fine
return TRUE;
}
// NB: this function has (desired) side effect of changing current locale
-bool wxLocale::Init(const char *szName,
- const char *szShort,
- const char *szLocale,
+bool wxLocale::Init(const wxChar *szName,
+ const wxChar *szShort,
+ const wxChar *szLocale,
bool bLoadDefault)
{
m_strLocale = szName;
// 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);
m_pMsgCat = NULL;
bool bOk = TRUE;
if ( bLoadDefault )
- bOk = AddCatalog("wxstd");
+ bOk = AddCatalog(T("wxstd"));
return bOk;
}
// 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
-const char *wxLocale::GetString(const char *szOrigString,
- const char *szDomain) const
+const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
+ const wxChar *szDomain) const
{
- if ( IsEmpty(szOrigString) )
+ if ( wxIsEmpty(szOrigString) )
return szDomain;
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 ) {
// 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 ) {
- pszTrans = pMsgCat->GetString(szOrigString);
+ pszTrans = pMsgCat->GetString(szOrgString);
if ( pszTrans != NULL ) // take the first found
break;
}
}
}
- return szOrigString;
+ return (wxMB2WXbuf)(szOrigString);
}
else
- return pszTrans;
+ {
+ // FIXME it was
+ // return (wxMB2WXbuf)(wxConvCurrent->cMB2WX(pszTrans));
+ // before, but we don't want to use wxConvCurrent explicitly to
+ // avoid linking unnecessary code in ANSI programs without MB
+ // support
+ return (wxMB2WXbuf)(pszTrans);
+ }
+
+ #undef szOrgString
}
// 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 ) {
- if ( Stricmp(pMsgCat->GetName(), szDomain) == 0 )
+ if ( wxStricmp(pMsgCat->GetName(), szDomain) == 0 )
return pMsgCat;
}
}
// 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
-bool wxLocale::AddCatalog(const char *szDomain)
+bool wxLocale::AddCatalog(const wxChar *szDomain)
{
wxMsgCatalog *pMsgCat = new wxMsgCatalog;
g_pLocale = pLocale;
return pOld;
}
+
+#endif // wxUSE_INTL
+
projects / wxWidgets.git / blobdiff