Add charset support to wxLocaleIdent and accessors

Charset is important for Unix systems as some locales may not be
available without it, e.g. "xx_XX" may not be supported, but
"xx_XX.utf8" could be.
This commit is contained in:
Vadim Zeitlin
2021-08-30 01:05:14 +02:00
parent 20e3697f00
commit 592e1678ce
3 changed files with 57 additions and 3 deletions

View File

@@ -140,20 +140,34 @@ public:
return *this;
}
// Set script
// Set script (not supported under Unix)
wxLocaleIdent& Script(const wxString& script)
{
m_script = script;
return *this;
}
// Set modifier
// Set charset (only supported under Unix)
wxLocaleIdent& Charset(const wxString& charset)
{
m_charset = charset;
return *this;
}
// Set modifier (only supported under Unix)
wxLocaleIdent& Modifier(const wxString& modifier)
{
m_modifier = modifier;
return *this;
}
// Accessors for the individual fields.
const wxString& GetLanguage() const { return m_language; }
const wxString& GetRegion() const { return m_region; }
const wxString& GetScript() const { return m_script; }
const wxString& GetCharset() const { return m_charset; }
const wxString& GetModifier() const { return m_modifier; }
// Construct platform dependent name
wxString GetName() const;
@@ -167,6 +181,7 @@ private:
wxString m_language;
wxString m_region;
wxString m_script;
wxString m_charset;
wxString m_modifier;
};