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

assert in AddCatalog() if Init() hadn't been called and also check that we have a valid language spec in wxMsgCatalogFile::Load() to ensure we don't form invalid paths there; call Init() before AddCatalog() in the sample

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-14 19:06:59 +00:00
parent f6ba36e464
commit 6f0114437c
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samples/internat/internat.cpp
View File

@@ -218,16 +218,13 @@ bool MyApp::OnInit()
m_lang = lng == -1 ? wxLANGUAGE_DEFAULT : langIds[lng]; m_lang = lng == -1 ? wxLANGUAGE_DEFAULT : langIds[lng];
} }
if ( m_lang != wxLANGUAGE_DEFAULT ) // don't use wxLOCALE_LOAD_DEFAULT flag so that Init() doesn't return
// false just because it failed to load wxstd catalog
if ( !m_locale.Init(m_lang, wxLOCALE_CONV_ENCODING) )
{ {
// don't use wxLOCALE_LOAD_DEFAULT flag so that Init() doesn't return wxLogWarning(_("This language is not supported by the system."));
// false just because it failed to load wxstd catalog
if ( !m_locale.Init(m_lang, wxLOCALE_CONV_ENCODING) )
{
wxLogWarning(_("This language is not supported by the system."));
// continue nevertheless // continue nevertheless
}
} }
// normally this wouldn't be necessary as the catalog files would be found // normally this wouldn't be necessary as the catalog files would be found

5
src/common/intl.cpp
View File

@@ -1177,6 +1177,9 @@ static wxString GetFullSearchPath(const wxString& lang)
bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName, bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,
wxPluralFormsCalculatorPtr& rPluralFormsCalculator) wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
{ {
wxCHECK_MSG( szDirPrefix.length() >= LEN_LANG, false,
"invalid language specification" );
wxString searchPath; wxString searchPath;
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
@@ -2570,6 +2573,8 @@ bool wxLocale::AddCatalog(const wxString& szDomain,
const wxString& msgIdCharset) const wxString& msgIdCharset)
{ {
wxCHECK_MSG( IsOk(), false, "must initialize catalog first" );
wxMsgCatalog *pMsgCat = new wxMsgCatalog; wxMsgCatalog *pMsgCat = new wxMsgCatalog;
if ( pMsgCat->Load(m_strShort, szDomain, msgIdCharset, m_bConvertEncoding) ) if ( pMsgCat->Load(m_strShort, szDomain, msgIdCharset, m_bConvertEncoding) )