AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added wxLocale::Init() and ctor without arguments for convenience

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1998-08-03 22:54:15 +00:00
parent 275bf4c13a
commit 23fcecf783
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/intl.h
View File

@ -57,11 +57,19 @@ 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 = NULL, // dir prefix (for msg files)
const char *szLocale = NULL, // locale (for setlocale)
bool bLoadDefault = TRUE); // preload wxstd.mo?
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 = NULL,
const char *szLocale = NULL,
bool bLoadDefault = TRUE);
// restores old locale
~wxLocale();

25
src/common/intl.cpp
View File

@ -363,13 +363,21 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
// wxLocale
// ----------------------------------------------------------------------------
// NB: ctor has (desired) side effect of changing current locale
wxLocale::wxLocale(const char *szName,
const char *szShort,
const char *szLocale,
bool bLoadDefault)
: m_strLocale(szName), m_strShort(szShort)
wxLocale::wxLocale()
{
m_pszOldLocale = NULL;
m_pMsgCat = NULL;
}
// 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)
{
m_strLocale = szName;
m_strShort = szShort;
// change current locale (default: same as long name)
if ( szLocale == NULL )
szLocale = szName;
@ -390,8 +398,11 @@ wxLocale::wxLocale(const char *szName,
// load the default catalog with wxWindows standard messages
m_pMsgCat = NULL;
bool bOk = TRUE;
if ( bLoadDefault )
AddCatalog("wxstd");
bOk = AddCatalog("wxstd");
return bOk;
}
// clean up