X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/978af864269a739e77d9431c8465435e3f8f7407..2c17722ec8a15d93ef9ec4a4ff390a0db9a34d9d:/include/wx/intl.h diff --git a/include/wx/intl.h b/include/wx/intl.h index 4a1b2b4ab8..ba26a16295 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -16,6 +16,16 @@ #include "wx/defs.h" #include "wx/string.h" +// Make wxLayoutDirection enum available without need for wxUSE_INTL so wxWindow, wxApp +// and other classes are not distrubed by wxUSE_INTL + +enum wxLayoutDirection +{ + wxLayout_Default, + wxLayout_LeftToRight, + wxLayout_RightToLeft +}; + #if wxUSE_INTL #include "wx/fontenc.h" @@ -302,13 +312,6 @@ enum wxLanguage // --- --- --- generated code ends here --- --- --- -enum wxLayoutDirection -{ - wxLayout_Default, - wxLayout_LeftToRight, - wxLayout_RightToLeft -}; - // ---------------------------------------------------------------------------- // wxLanguageInfo: encapsulates wxLanguage to OS native lang.desc. // translation information @@ -379,15 +382,15 @@ public: wxLocale() { DoCommonInit(); } // the ctor has a side effect of changing current locale - wxLocale(const wxChar *szName, // name (for messages) - const wxChar *szShort = (const wxChar *) NULL, // dir prefix (for msg files) - const wxChar *szLocale = (const wxChar *) NULL, // locale (for setlocale) + wxLocale(const wxString& name, // name (for messages) + const wxString& shortName = wxEmptyString, // dir prefix (for msg files) + const wxString& locale = wxEmptyString, // locale (for setlocale) bool bLoadDefault = true, // preload wxstd.mo? bool bConvertEncoding = false) // convert Win<->Unix if necessary? { DoCommonInit(); - Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding); + Init(name, shortName, locale, bLoadDefault, bConvertEncoding); } wxLocale(int language, // wxLanguage id or custom language @@ -399,9 +402,9 @@ public: } // the same as a function (returns true on success) - bool Init(const wxChar *szName, - const wxChar *szShort = (const wxChar *) NULL, - const wxChar *szLocale = (const wxChar *) NULL, + bool Init(const wxString& name, + const wxString& shortName = wxEmptyString, + const wxString& locale = wxEmptyString, bool bLoadDefault = true, bool bConvertEncoding = false); @@ -432,7 +435,7 @@ public: bool IsOk() const { return m_pszOldLocale != NULL; } // returns locale name - const wxChar *GetLocale() const { return m_strLocale; } + const wxString& GetLocale() const { return m_strLocale; } // return current locale wxLanguage value int GetLanguage() const { return m_language; } @@ -459,12 +462,15 @@ public: // The loaded catalog will be used for message lookup by GetString(). // // Returns 'true' if it was successfully loaded - bool AddCatalog(const wxChar *szDomain); - bool AddCatalog(const wxChar *szDomain, - wxLanguage msgIdLanguage, const wxChar *msgIdCharset); + bool AddCatalog(const wxString& domain); + bool AddCatalog(const wxString& domain, + wxLanguage msgIdLanguage, const wxString& msgIdCharset); + + // check if the given locale is provided by OS and C run time + static bool IsAvailable(int lang); // check if the given catalog is loaded - bool IsLoaded(const wxChar *szDomain) const; + bool IsLoaded(const wxString& domain) const; // Retrieve the language info struct for the given language // @@ -498,20 +504,20 @@ public: // // domains are searched in the last to first order, i.e. catalogs // added later override those added before. - virtual const wxChar *GetString(const wxChar *szOrigString, - const wxChar *szDomain = NULL) const; + virtual const wxString& GetString(const wxString& origString, + const wxString& domain = wxEmptyString) const; // plural form version of the same: - virtual const wxChar *GetString(const wxChar *szOrigString, - const wxChar *szOrigString2, - size_t n, - const wxChar *szDomain = NULL) const; + virtual const wxString& GetString(const wxString& origString, + const wxString& origString2, + size_t n, + const wxString& domain = wxEmptyString) const; // Returns the current short name for the locale const wxString& GetName() const { return m_strShort; } // return the contents of .po file header - wxString GetHeaderValue( const wxChar* szHeader, - const wxChar* szDomain = NULL ) const; + wxString GetHeaderValue(const wxString& header, + const wxString& domain = wxEmptyString) const; // These two methods are for internal use only. First one creates // ms_languagesDB if it doesn't already exist, second one destroys @@ -521,7 +527,7 @@ public: private: // find catalog by name in a linked list, return NULL if !found - wxMsgCatalog *FindCatalog(const wxChar *szDomain) const; + wxMsgCatalog *FindCatalog(const wxString& domain) const; // copy default table of languages from global static array to // m_langugagesInfo, called by InitLanguagesDB @@ -556,22 +562,25 @@ private: extern WXDLLIMPEXP_BASE wxLocale* wxGetLocale(); // get the translation of the string in the current locale -inline const wxChar *wxGetTranslation(const wxChar *sz, const wxChar* domain=NULL) +inline const wxString& wxGetTranslation(const wxString& str, + const wxString& domain = wxEmptyString) { wxLocale *pLoc = wxGetLocale(); if (pLoc) - return pLoc->GetString(sz, domain); + return pLoc->GetString(str, domain); else - return sz; + return str; } -inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2, - size_t n, const wxChar* domain=NULL) +inline const wxString& wxGetTranslation(const wxString& str1, + const wxString& str2, + size_t n, + const wxString& domain = wxEmptyString) { wxLocale *pLoc = wxGetLocale(); if (pLoc) - return pLoc->GetString(sz1, sz2, n, domain); + return pLoc->GetString(str1, str2, n, domain); else - return n == 1 ? sz1 : sz2; + return n == 1 ? str1 : str2; } #else // !wxUSE_INTL @@ -586,9 +595,11 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2, #define wxTRANSLATE(str) _T(str) -// Note: use of 'inline' here can cause this symbol not to be found when compiled with gcc -//const wxChar *wxGetTranslation(const wxChar *sz); -#define wxGetTranslation(sz) (sz) +inline const wxString& wxGetTranslation(const wxString& str, + const wxString& WXUNUSED(domain) = wxEmptyString) +{ + return str; +} #endif // wxUSE_INTL/!wxUSE_INTL @@ -604,4 +615,3 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2, #endif #endif // _WX_INTL_H_ -