support SDK < 10.6, fixes #14902

[wxWidgets.git] / include / wx / translation.h

diff --git a/include/wx/translation.h b/include/wx/translation.h
index 344379ec3603b5126fb991ffd85773dd475dda9c..c12ae52046d6fb7f05680400983f07faa5425a46 100644 (file)
--- a/include/wx/translation.h
+++ b/include/wx/translation.h
@@ -48,6 +48,7 @@
 // forward decls
 // ----------------------------------------------------------------------------
 
 // forward decls
 // ----------------------------------------------------------------------------
 

+class WXDLLIMPEXP_FWD_BASE wxArrayString;

 class WXDLLIMPEXP_FWD_BASE wxTranslationsLoader;
 class WXDLLIMPEXP_FWD_BASE wxLocale;
 
 class WXDLLIMPEXP_FWD_BASE wxTranslationsLoader;
 class WXDLLIMPEXP_FWD_BASE wxLocale;
 


@@ -128,6 +129,14 @@ public:
     void SetLanguage(wxLanguage lang);
     void SetLanguage(const wxString& lang);
 
     void SetLanguage(wxLanguage lang);
     void SetLanguage(const wxString& lang);
 

+    // 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();
 


@@ -164,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;
 


@@ -192,6 +197,8 @@ public:
 
     virtual wxMsgCatalog *LoadCatalog(const wxString& domain,
                                       const wxString& lang) = 0;
 
     virtual wxMsgCatalog *LoadCatalog(const wxString& domain,
                                       const wxString& lang) = 0;

+
+    virtual wxArrayString GetAvailableTranslations(const wxString& domain) const = 0;

 };
 
 
 };
 
 


@@ -204,6 +211,8 @@ public:
 
     virtual wxMsgCatalog *LoadCatalog(const wxString& domain,
                                       const wxString& lang);
 
     virtual wxMsgCatalog *LoadCatalog(const wxString& domain,
                                       const wxString& lang);

+
+    virtual wxArrayString GetAvailableTranslations(const wxString& domain) const;

 };
 
 
 };
 
 


@@ -216,6 +225,8 @@ public:
     virtual wxMsgCatalog *LoadCatalog(const wxString& domain,
                                       const wxString& lang);
 
     virtual wxMsgCatalog *LoadCatalog(const wxString& domain,
                                       const wxString& lang);
 

+    virtual wxArrayString GetAvailableTranslations(const wxString& domain) const;
+

 protected:
     // returns resource type to use for translations
     virtual wxString GetResourceType() const { return "MOFILE"; }
 protected:
     // returns resource type to use for translations
     virtual wxString GetResourceType() const { return "MOFILE"; }