projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correctly link to wxWebViewNavigationError from wxWebViewEvent.
[wxWidgets.git]
/
include
/
wx
/
translation.h
diff --git
a/include/wx/translation.h
b/include/wx/translation.h
index 67b2bd8afcc7faf3ed3f2f87bf6512ab529e8a4f..c12ae52046d6fb7f05680400983f07faa5425a46 100644
(file)
--- a/
include/wx/translation.h
+++ b/
include/wx/translation.h
@@
-132,6
+132,11
@@
public:
// get languages available for this app
wxArrayString GetAvailableTranslations(const wxString& domain) const;
// get languages available for this app
wxArrayString GetAvailableTranslations(const wxString& domain) const;
+ // find best translation language for given domain
+ wxString GetBestTranslation(const wxString& domain, wxLanguage msgIdLanguage);
+ wxString GetBestTranslation(const wxString& domain,
+ const wxString& msgIdLanguage = "en");
+
// add standard wxWidgets catalog ("wxstd")
bool AddStdCatalog();
// add standard wxWidgets catalog ("wxstd")
bool AddStdCatalog();
@@
-168,10
+173,6
@@
private:
// perform loading of the catalog via m_loader
bool LoadCatalog(const wxString& domain, const wxString& lang);
// perform loading of the catalog via m_loader
bool LoadCatalog(const wxString& domain, const wxString& lang);
- // find best translation for given domain
- wxString ChooseLanguageForDomain(const wxString& domain,
- const wxString& msgIdLang);
-
// find catalog by name in a linked list, return NULL if !found
wxMsgCatalog *FindCatalog(const wxString& domain) const;
// find catalog by name in a linked list, return NULL if !found
wxMsgCatalog *FindCatalog(const wxString& domain) const;