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

use wxConvWhateverWorks for translation strings

Browse Source 
Revert the introduction of wxGet-SetInlineEncoding()
This commit is contained in:
Arrigo Marchiori
2020-05-26 07:33:07 +02:00
committed by Vadim Zeitlin
parent 5facb56580
commit 3aaa31e703
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/translation.h
View File

@@ -300,15 +300,6 @@ inline const wxString& wxGetTranslation(const wxString& str1,
: wxTranslations::GetUntranslatedString(str2); : wxTranslations::GetUntranslatedString(str2);
} }
/*
* Get and set the default encoding for strings to be translated.
* These are only useful when the wxNO_IMPLICIT_WXSTRING_ENCODING macro is
* defined.
*/
WXDLLIMPEXP_BASE const wxMBConv &wxGetInlineEncoding();
WXDLLIMPEXP_BASE void wxSetInlineEncoding(const wxMBConv &conv);
#ifdef wxNO_IMPLICIT_WXSTRING_ENCODING #ifdef wxNO_IMPLICIT_WXSTRING_ENCODING
/* /*
@@ -318,7 +309,7 @@ WXDLLIMPEXP_BASE void wxSetInlineEncoding(const wxMBConv &conv);
inline const wxString& wxGetTranslation(const char *str, inline const wxString& wxGetTranslation(const char *str,
const char *domain = "", const char *domain = "",
const char *context = "") { const char *context = "") {
const wxMBConv &conv = wxGetInlineEncoding(); const wxMBConv &conv = wxConvWhateverWorks;
return wxGetTranslation(wxString(str, conv), wxString(domain, conv), return wxGetTranslation(wxString(str, conv), wxString(domain, conv),
wxString(context, conv)); wxString(context, conv));
} }
@@ -328,7 +319,7 @@ inline const wxString& wxGetTranslation(const char *str1,
unsigned n, unsigned n,
const char *domain = "", const char *domain = "",
const char *context = "") { const char *context = "") {
const wxMBConv &conv = wxGetInlineEncoding(); const wxMBConv &conv = wxConvWhateverWorks;
return wxGetTranslation(wxString(str1, conv), wxString(str2, conv), n, return wxGetTranslation(wxString(str1, conv), wxString(str2, conv), n,
wxString(domain, conv), wxString(domain, conv),
wxString(context, conv)); wxString(context, conv));

12
src/common/translation.cpp
View File

@@ -2110,16 +2110,4 @@ public:
wxIMPLEMENT_DYNAMIC_CLASS(wxTranslationsModule, wxModule); wxIMPLEMENT_DYNAMIC_CLASS(wxTranslationsModule, wxModule);
// Encoding for strings to be translated, passed as const char *.
static const wxMBConv *inlineEncoding = &wxConvLibc;
WXDLLIMPEXP_BASE const wxMBConv &wxGetInlineEncoding() {
return *inlineEncoding;
}
WXDLLIMPEXP_BASE void wxSetInlineEncoding(const wxMBConv &conv) {
inlineEncoding = &conv;
}
#endif // wxUSE_INTL #endif // wxUSE_INTL