Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This commit was manufactured by cvs2svn to create tag 'WX_2_8_4-rc2'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_8_4-rc2@45760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2007-05-02 14:53:49 +00:00
parent 0d3847e80c
commit 6a1e754a3e
743 changed files with 18620 additions and 92509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/intl.h
View File

@@ -562,7 +562,8 @@ 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 wxChar *
wxGetTranslation(const wxChar *sz, const wxChar* domain = NULL)
{
wxLocale *pLoc = wxGetLocale();
if (pLoc)
@@ -570,8 +571,11 @@ inline const wxChar *wxGetTranslation(const wxChar *sz, const wxChar* domain=NUL
else
return sz;
}
inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
size_t n, const wxChar* domain=NULL)
inline const wxChar *
wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
size_t n,
const wxChar *domain = NULL)
{
wxLocale *pLoc = wxGetLocale();
if (pLoc)
@@ -588,13 +592,16 @@ 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)
inline const wxChar *
wxGetTranslation(const wxChar *sz, const wxChar * WXUNUSED(domain) = NULL)
{
return sz;
}
#endif // wxUSE_INTL/!wxUSE_INTL