Deprecate wxLocale::AddCatalog() overload taking msgIdCharset

This parameter is never used any more, so it should be simply removed
from the application code using this function.
This commit is contained in:
Vadim Zeitlin 2023-10-02 19:11:06 +02:00
parent 94b1a17aeb
commit 64476dd3e7
3 changed files with 10 additions and 10 deletions

View file

@ -158,8 +158,15 @@ public:
// Returns 'true' if it was successfully loaded
bool AddCatalog(const wxString& domain);
bool AddCatalog(const wxString& domain, wxLanguage msgIdLanguage);
#if WXWIN_COMPATIBILITY_3_2
wxDEPRECATED_MSG("Remove unused msgIdCharset argument")
bool AddCatalog(const wxString& domain,
wxLanguage msgIdLanguage, const wxString& msgIdCharset);
wxLanguage msgIdLanguage, const wxString& WXUNUSED(msgIdCharset))
{
return AddCatalog(domain, msgIdLanguage);
}
#endif // WXWIN_COMPATIBILITY_3_2
// check if the given locale is provided by OS and C run time
static bool IsAvailable(int lang);

View file

@ -392,8 +392,8 @@ public:
/**
Calls wxTranslations::AddCatalog(const wxString&, const wxString&).
This overload shouldn't be used any longer as @a msgIdCharset is
just ignored.
@deprecated This overload shouldn't be used any longer as @a
msgIdCharset is just ignored, please omit it.
*/
bool AddCatalog(const wxString& domain, wxLanguage msgIdLanguage,
const wxString& msgIdCharset);

View file

@ -797,13 +797,6 @@ bool wxLocale::AddCatalog(const wxString& domain, wxLanguage msgIdLanguage)
return t->AddCatalog(domain, msgIdLanguage);
}
bool wxLocale::AddCatalog(const wxString& domain,
wxLanguage msgIdLanguage,
const wxString& WXUNUSED(msgIdCharset))
{
return AddCatalog(domain, msgIdLanguage);
}
bool wxLocale::IsLoaded(const wxString& domain) const
{
wxTranslations *t = wxTranslations::Get();