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

Remove returns of wxEmptyString

Browse Source
This commit is contained in:
Paul Cornett
2017-02-18 11:26:40 -08:00
parent 32535f5bf6
commit 6169ced23f
8 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/intl.cpp
View File

@@ -976,27 +976,31 @@ const wxLanguageInfo *wxLocale::GetLanguageInfo(int lang)
/* static */
wxString wxLocale::GetLanguageName(int lang)
{
wxString string;
if ( lang == wxLANGUAGE_DEFAULT || lang == wxLANGUAGE_UNKNOWN )
return wxEmptyString;
return string;
const wxLanguageInfo *info = GetLanguageInfo(lang);
if ( !info )
return wxEmptyString;
else
return info->Description;
if (info)
string = info->Description;
return string;
}
/* static */
wxString wxLocale::GetLanguageCanonicalName(int lang)
{
wxString string;
if ( lang == wxLANGUAGE_DEFAULT || lang == wxLANGUAGE_UNKNOWN )
return wxEmptyString;
return string;
const wxLanguageInfo *info = GetLanguageInfo(lang);
if ( !info )
return wxEmptyString;
else
return info->CanonicalName;
if (info)
string = info->CanonicalName;
return string;
}
/* static */