X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beb59f36c016d27cf8949eb8c0d38fc63ad536a..07b1232d2c3de105855c17a46e4285547a1c736f:/include/wx/intl.h diff --git a/include/wx/intl.h b/include/wx/intl.h index 87c60ae32f..127c2c15d5 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -13,13 +13,19 @@ #ifndef _WX_INTL_H_ #define _WX_INTL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "intl.h" -#endif - #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" @@ -33,10 +39,11 @@ // ---------------------------------------------------------------------------- // gettext() style macros (notice that xgettext should be invoked with -// --keyword="_" --keyword="wxGetTranslation:1,2" options +// --keyword="_" --keyword="wxPLURAL:1,2" options // to extract the strings from the sources) #ifndef WXINTL_NO_GETTEXT_MACRO - #define _(s) wxGetTranslation(_T(s)) + #define _(s) wxGetTranslation(_T(s)) + #define wxPLURAL(sing, plur, n) wxGetTranslation(_T(sing), _T(plur), n) #endif // another one which just marks the strings for extraction, but doesn't @@ -47,8 +54,8 @@ // forward decls // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxLocale; -class WXDLLIMPEXP_BASE wxLanguageInfoArray; +class WXDLLIMPEXP_FWD_BASE wxLocale; +class WXDLLIMPEXP_FWD_BASE wxLanguageInfoArray; class wxMsgCatalog; // ============================================================================ @@ -319,6 +326,7 @@ struct WXDLLIMPEXP_BASE wxLanguageInfo WinSublang; #endif // __WIN32__ wxString Description; // human-readable name of the language + wxLayoutDirection LayoutDirection; }; // ---------------------------------------------------------------------------- @@ -374,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 neccessary? + 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 @@ -394,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); @@ -405,9 +413,9 @@ public: int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); // restores old locale - ~wxLocale(); + virtual ~wxLocale(); - // Try to get user's (or OS's) prefered language setting. + // Try to get user's (or OS's) preferred language setting. // Return wxLANGUAGE_UNKNOWN if language-guessing algorithm failed static int GetSystemLanguage(); @@ -427,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; } @@ -454,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 // @@ -493,20 +504,25 @@ public: // // domains are searched in the last to first order, i.e. catalogs // added later override those added before. - 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: - 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; + + // this is hack to work around a problem with wxGetTranslation() which + // returns const wxString& and not wxString, so when it returns untranslated + // string, it needs to have a copy of it somewhere + static const wxString& GetUntranslatedString(const wxString& str); // 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 @@ -516,7 +532,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 @@ -529,7 +545,7 @@ private: m_strShort; // short name for the locale int m_language; // this locale wxLanguage value - const wxChar *m_pszOldLocale; // previous locale from setlocale() + const char *m_pszOldLocale; // previous locale from setlocale() wxLocale *m_pOldLocale; // previous wxLocale wxMsgCatalog *m_pMsgCat; // pointer to linked list of catalogs @@ -551,22 +567,31 @@ private: extern WXDLLIMPEXP_BASE wxLocale* wxGetLocale(); // get the translation of the string in the current locale -inline const wxChar *wxGetTranslation(const wxChar *sz) +inline const wxString& wxGetTranslation(const wxString& str, + const wxString& domain = wxEmptyString) { wxLocale *pLoc = wxGetLocale(); if (pLoc) - return pLoc->GetString(sz); + return pLoc->GetString(str, domain); else - return sz; + // NB: this function returns reference to a string, so we have to keep + // a copy of it somewhere + return wxLocale::GetUntranslatedString(str); } -inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2, - size_t n) +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); + return pLoc->GetString(str1, str2, n, domain); else - return n == 1 ? sz1 : sz2; + // NB: this function returns reference to a string, so we have to keep + // a copy of it somewhere + return n == 1 + ? wxLocale::GetUntranslatedString(str1) + : wxLocale::GetUntranslatedString(str2); } #else // !wxUSE_INTL @@ -577,13 +602,32 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2, #if !defined(_) #define _(s) (_T(s)) #endif + #define wxPLURAL(sing, plur, n) ((n) == 1 ? _T(sing) : _T(plur)) #endif #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) +// NB: we use a template here in order to avoid using +// wxLocale::GetUntranslatedString() above, which would be required if +// we returned const wxString&; this way, the compiler should be able to +// optimize wxGetTranslation() away + +template +inline TString wxGetTranslation(TString str) + { return str; } + +template +inline TString wxGetTranslation(TString str, TDomain WXUNUSED(domain)) + { return str; } + +template +inline TString wxGetTranslation(TString str1, TString str2, size_t n) + { return n == 1 ? str1 : str2; } + +template +inline TString wxGetTranslation(TString str1, TString str2, size_t n, + TDomain WXUNUSED(domain)) + { return n == 1 ? str1 : str2; } #endif // wxUSE_INTL/!wxUSE_INTL @@ -599,4 +643,3 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2, #endif #endif // _WX_INTL_H_ -