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

Don't assert in wxLocale::IsAvailable() if language is not supported.

Browse Source 
We can fail to find language information if we're called with
wxLANGUAGE_DEFAULT and we don't support the current system language.

Closes #14039.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-02-25 23:49:39 +00:00
parent 7c9b6c9111
commit 0f4bf6ac80
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/intl.cpp
View File

@@ -1033,7 +1033,14 @@ wxLocale::~wxLocale()
bool wxLocale::IsAvailable(int lang) bool wxLocale::IsAvailable(int lang)
{ {
const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang); const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang);
wxCHECK_MSG( info, false, wxS("invalid language") ); if ( !info )
{
// The language is unknown (this normally only happens when we're
// passed wxLANGUAGE_DEFAULT), so we can't support it.
wxASSERT_MSG( lang == wxLANGUAGE_DEFAULT,
wxS("No info for a valid language?") );
return false;
}
#if defined(__WIN32__) #if defined(__WIN32__)
if ( !info->WinLang ) if ( !info->WinLang )