cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A couple of identifiers at global level moved to the .cpp file from .h where

Browse Source 
they had nothing to do from the very beginning


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-02-15 23:09:33 +00:00
parent 59734eb597
commit 84c188148d
2 changed files with 95 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
include/wx/intl.h
View File

@ -6,14 +6,14 @@
// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __INTLH__
#define __INTLH__
#ifdef __GNUG__
#pragma interface "intl.h"
#pragma interface "intl.h"
#endif
#include "wx/defs.h"
@ -23,21 +23,14 @@
// global decls
// ============================================================================
// ----------------------------------------------------------------------------
// simple types
// ----------------------------------------------------------------------------
// # adjust if necessary
typedef unsigned char size_t8;
typedef unsigned long size_t32;
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
// gettext() style macro
// gettext() style macro (notice that xgettext should be invoked with "-k_"
// option to extract the strings inside _() from the sources)
#ifndef WXINTL_NO_GETTEXT_MACRO
#define _(str) wxGetTranslation(str)
#define _(str) wxGetTranslation(str)
#endif
// ----------------------------------------------------------------------------
@ -45,7 +38,6 @@ typedef unsigned long size_t32;
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxLocale;
class WXDLLEXPORT wxMsgCatalog;
extern WXDLLEXPORT_DATA(wxLocale *) g_pLocale;
// ============================================================================
// locale support
@ -53,89 +45,94 @@ extern WXDLLEXPORT_DATA(wxLocale *) g_pLocale;
// ----------------------------------------------------------------------------
// wxLocale: encapsulates all language dependent settings, including current
// message catalogs, date, time and currency formats (#### to do) &c
// message catalogs, date, time and currency formats (TODO) &c
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxLocale
{
public:
// ctor & dtor
// call Init() if you use this ctor
wxLocale();
// the ctor has a side effect of changing current locale
wxLocale(const char *szName, // name (for messages)
const char *szShort = (const char *) NULL, // dir prefix (for msg files)
const char *szLocale = (const char *) NULL, // locale (for setlocale)
bool bLoadDefault = TRUE) // preload wxstd.mo?
{ Init(szName, szShort, szLocale, bLoadDefault); }
// the same as a function (returns TRUE on success)
bool Init(const char *szName,
const char *szShort = (const char *) NULL,
const char *szLocale = (const char *) NULL,
bool bLoadDefault = TRUE);
// restores old locale
~wxLocale();
// ctor & dtor
// -----------
// returns locale name
const char *GetLocale() const { return m_strLocale; }
// call Init() if you use this ctor
wxLocale();
// the ctor has a side effect of changing current locale
wxLocale(const char *szName, // name (for messages)
const char *szShort = (const char *) NULL, // dir prefix (for msg files)
const char *szLocale = (const char *) NULL, // locale (for setlocale)
bool bLoadDefault = TRUE) // preload wxstd.mo?
{ Init(szName, szShort, szLocale, bLoadDefault); }
// the same as a function (returns TRUE on success)
bool Init(const char *szName,
const char *szShort = (const char *) NULL,
const char *szLocale = (const char *) NULL,
bool bLoadDefault = TRUE);
// restores old locale
~wxLocale();
// add a prefix to the catalog lookup path: the message catalog files will be
// looked up under prefix/<lang>/LC_MESSAGES, prefix/LC_MESSAGES and prefix
// (in this order).
//
// This only applies to subsequent invocations of AddCatalog()!
static void AddCatalogLookupPathPrefix(const wxString& prefix);
// add a catalog: it's searched for in standard places (current directory
// first, system one after), but the you may prepend additional directories to
// the search path with AddCatalogLookupPathPrefix().
//
// The loaded catalog will be used for message lookup by GetString().
//
// Returns 'true' if it was successfully loaded
bool AddCatalog(const char *szDomain);
// check if the given catalog is loaded
bool IsLoaded(const char *szDomain) const;
// retrieve the translation for a string in all loaded domains unless
// the szDomain parameter is specified (and then only this domain is
// searched)
//
// return original string if translation is not available
// (in this case an error message is generated the first time
// a string is not found; use wxLogNull to suppress it)
//
// domains are searched in the last to first order, i.e. catalogs
// added later override those added before.
const char *GetString(const char *szOrigString,
const char *szDomain = (const char *) NULL) const;
// returns locale name
const char *GetLocale() const { return m_strLocale; }
// Returns the current short name for the locale
wxString const &GetName() const { return m_strShort; }
private:
// find catalog by name in a linked list, return NULL if !found
wxMsgCatalog *FindCatalog(const char *szDomain) const;
// add a prefix to the catalog lookup path: the message catalog files will be
// looked up under prefix/<lang>/LC_MESSAGES, prefix/LC_MESSAGES and prefix
// (in this order).
//
// This only applies to subsequent invocations of AddCatalog()!
static void AddCatalogLookupPathPrefix(const wxString& prefix);
wxString m_strLocale, // this locale name
m_strShort; // short name for the locale
const char *m_pszOldLocale; // previous locale from setlocale()
wxLocale *m_pOldLocale; // previous wxLocale
wxMsgCatalog *m_pMsgCat; // pointer to linked list of catalogs
// add a catalog: it's searched for in standard places (current directory
// first, system one after), but the you may prepend additional directories to
// the search path with AddCatalogLookupPathPrefix().
//
// The loaded catalog will be used for message lookup by GetString().
//
// Returns 'true' if it was successfully loaded
bool AddCatalog(const char *szDomain);
// check if the given catalog is loaded
bool IsLoaded(const char *szDomain) const;
// retrieve the translation for a string in all loaded domains unless
// the szDomain parameter is specified (and then only this domain is
// searched)
//
// return original string if translation is not available
// (in this case an error message is generated the first time
// a string is not found; use wxLogNull to suppress it)
//
// domains are searched in the last to first order, i.e. catalogs
// added later override those added before.
const char *GetString(const char *szOrigString,
const char *szDomain = (const char *) NULL) const;
// Returns the current short name for the locale
const wxString& GetName() const { return m_strShort; }
private:
// find catalog by name in a linked list, return NULL if !found
wxMsgCatalog *FindCatalog(const char *szDomain) const;
wxString m_strLocale, // this locale name
m_strShort; // short name for the locale
const char *m_pszOldLocale; // previous locale from setlocale()
wxLocale *m_pOldLocale; // previous wxLocale
wxMsgCatalog *m_pMsgCat; // pointer to linked list of catalogs
};
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------
WXDLLEXPORT wxLocale* wxGetLocale();
// get the translation of the string in the current locale
// get the current locale object (note that it may be NULL!)
extern WXDLLEXPORT wxLocale* wxGetLocale();
// get the translation of the string in the current locale
inline const char *wxGetTranslation(const char *sz)
{
wxLocale *pLoc = wxGetLocale();
return pLoc == (wxLocale *) NULL ? sz : pLoc->GetString(sz);
wxLocale *pLoc = wxGetLocale();
return pLoc ? pLoc->GetString(sz) : sz;
}
#endif
// _WX_INTLH__
// _WX_INTLH__

29
src/common/intl.cpp
View File

@ -18,14 +18,14 @@
// ----------------------------------------------------------------------------
#ifdef __GNUG__
#pragma implementation "intl.h"
#pragma implementation "intl.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
// standard headers
@ -41,6 +41,14 @@
#include <stdlib.h>
// ----------------------------------------------------------------------------
// simple types
// ----------------------------------------------------------------------------
// FIXME adjust if necessary
typedef unsigned char size_t8;
typedef unsigned long size_t32;
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
@ -68,8 +76,7 @@ void wxRestoreTransErrors();
// get the current state
bool wxIsLoggingTransErrors();
// get the current locale object (## may be NULL!)
extern wxLocale *wxSetLocale(wxLocale *pLocale);
static wxLocale *wxSetLocale(wxLocale *pLocale);
// ----------------------------------------------------------------------------
// wxMsgCatalog corresponds to one disk-file message catalog.
@ -112,21 +119,21 @@ private:
struct wxMsgCatalogHeader
{
size_t32 magic, // offset +00: magic id
revision, // +04: revision
numStrings; // +08: number of strings in the file
revision, // +04: revision
numStrings; // +08: number of strings in the file
size_t32 ofsOrigTable, // +0C: start of original string table
ofsTransTable; // +10: start of translated string table
ofsTransTable; // +10: start of translated string table
size_t32 nHashSize, // +14: hash table size
ofsHashTable; // +18: offset of hash table start
ofsHashTable; // +18: offset of hash table start
};
// all data is stored here, NULL if no data loaded
size_t8 *m_pData;
// data description
size_t32 m_numStrings, // number of strings in this domain
size_t32 m_numStrings, // number of strings in this domain
m_nHashSize; // number of entries in hash table
size_t32 *m_pHashTable; // pointer to hash table
size_t32 *m_pHashTable; // pointer to hash table
wxMsgTableEntry *m_pOrigTable, // pointer to original strings
*m_pTransTable; // translated
@ -592,7 +599,7 @@ bool wxIsLoggingTransErrors()
// ------------------------------
// the current locale object
wxLocale *g_pLocale = NULL;
static wxLocale *g_pLocale = NULL;
wxLocale *wxGetLocale()
{