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

return reference to non-temporary wxString instance from wxGetTranslation() even when not translating

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-21 17:44:37 +00:00
parent fe4a282956
commit a64be16ef8
2 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/wx/intl.h
View File

@@ -512,6 +512,11 @@ public:
size_t n,
const wxString& domain = wxEmptyString) const;
// this is hack to work around a problem with wxGetTranslation() which
// returns const wxString& and not wxString, so when it returns untranslated
// string, it needs to have a copy of it somewhere
static const wxString& GetUntranslatedString(const wxString& str);
// Returns the current short name for the locale
const wxString& GetName() const { return m_strShort; }
@@ -569,7 +574,9 @@ inline const wxString& wxGetTranslation(const wxString& str,
if (pLoc)
return pLoc->GetString(str, domain);
else
return str;
// NB: this function returns reference to a string, so we have to keep
// a copy of it somewhere
return wxLocale::GetUntranslatedString(str);
}
inline const wxString& wxGetTranslation(const wxString& str1,
const wxString& str2,
@@ -580,7 +587,11 @@ inline const wxString& wxGetTranslation(const wxString& str1,
if (pLoc)
return pLoc->GetString(str1, str2, n, domain);
else
return n == 1 ? str1 : str2;
// NB: this function returns reference to a string, so we have to keep
// a copy of it somewhere
return n == 1
? wxLocale::GetUntranslatedString(str1)
: wxLocale::GetUntranslatedString(str2);
}
#else // !wxUSE_INTL
@@ -596,22 +607,27 @@ inline const wxString& wxGetTranslation(const wxString& str1,
#define wxTRANSLATE(str) _T(str)
inline const wxString& wxGetTranslation(const wxString& str,
const wxString& WXUNUSED(domain) = wxEmptyString)
{
return str;
}
// NB: we use a template here in order to avoid using
// wxLocale::GetUntranslatedString() above, which would be required if
// we returned const wxString&; this way, the compiler should be able to
// optimize wxGetTranslation() away
inline const wxString& wxGetTranslation(const wxString& str1,
const wxString& str2,
size_t n,
const wxString& WXUNUSED(domain) = wxEmptyString)
{
if ( n == 1 )
return str1;
else
return str2;
}
template<typename TString>
inline TString wxGetTranslation(TString str)
{ return str; }
template<typename TString, typename TDomain>
inline TString wxGetTranslation(TString str, TDomain WXUNUSED(domain))
{ return str; }
template<typename TString, typename TDomain>
inline TString wxGetTranslation(TString str1, TString str2, size_t n)
{ return n == 1 ? str1 : str2; }
template<typename TString, typename TDomain>
inline TString wxGetTranslation(TString str1, TString str2, size_t n,
TDomain WXUNUSED(domain))
{ return n == 1 ? str1 : str2; }
#endif // wxUSE_INTL/!wxUSE_INTL