// ----------------------------------------------------------------------------
// gettext() style macros (notice that xgettext should be invoked with
// ----------------------------------------------------------------------------
// gettext() style macros (notice that xgettext should be invoked with
- #define _(s) wxGetTranslation(_T(s))
+ #define _(s) wxGetTranslation(_T(s))
+ #define wxPLURAL(sing, plur, n) wxGetTranslation(_T(sing), _T(plur), n)
const wxChar *szShort = (const wxChar *) NULL, // dir prefix (for msg files)
const wxChar *szLocale = (const wxChar *) NULL, // locale (for setlocale)
bool bLoadDefault = true, // preload wxstd.mo?
const wxChar *szShort = (const wxChar *) NULL, // dir prefix (for msg files)
const wxChar *szLocale = (const wxChar *) NULL, // locale (for setlocale)
bool bLoadDefault = true, // preload wxstd.mo?
bool AddCatalog(const wxChar *szDomain,
wxLanguage msgIdLanguage, const wxChar *msgIdCharset);
bool AddCatalog(const wxChar *szDomain,
wxLanguage msgIdLanguage, const wxChar *msgIdCharset);
//
// domains are searched in the last to first order, i.e. catalogs
// added later override those added before.
//
// 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 wxChar *GetString(const wxChar *szOrigString,
+ const wxChar *szDomain = NULL) const;
- const wxChar *GetString(const wxChar *szOrigString,
- const wxChar *szOrigString2,
- size_t n,
- const wxChar *szDomain = NULL) const;
+ virtual const wxChar *GetString(const wxChar *szOrigString,
+ const wxChar *szOrigString2,
+ size_t n,
+ const wxChar *szDomain = NULL) const;
// Returns the current short name for the locale
const wxString& GetName() const { return m_strShort; }
// Returns the current short name for the locale
const wxString& GetName() const { return m_strShort; }
extern WXDLLIMPEXP_BASE wxLocale* wxGetLocale();
// get the translation of the string in the current locale
extern WXDLLIMPEXP_BASE wxLocale* wxGetLocale();
// get the translation of the string in the current locale
-// 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 wxChar *wxGetTranslation(const wxChar *sz,
+ const wxChar *WXUNUSED(domain) = NULL)
+{
+ return sz;
+}