From 066f3611df971be93b2ec46b82c2f05f3ff9a422 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 7 Sep 2007 19:34:56 +0000 Subject: [PATCH] don't use _T() inside wxGetTranslation() and related macros (wxTRANSLATE, _, ...) to preserve compatibility with the old ASCII build (even at the expense with the Unicode build compatibility) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/intl.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/intl.h b/include/wx/intl.h index 127c2c15d5..4a996c086b 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -42,13 +42,13 @@ enum wxLayoutDirection // --keyword="_" --keyword="wxPLURAL:1,2" options // to extract the strings from the sources) #ifndef WXINTL_NO_GETTEXT_MACRO - #define _(s) wxGetTranslation(_T(s)) - #define wxPLURAL(sing, plur, n) wxGetTranslation(_T(sing), _T(plur), n) + #define _(s) wxGetTranslation((s)) + #define wxPLURAL(sing, plur, n) wxGetTranslation((sing), (plur), n) #endif // another one which just marks the strings for extraction, but doesn't // perform the translation (use -kwxTRANSLATE with xgettext!) -#define wxTRANSLATE(str) _T(str) +#define wxTRANSLATE(str) (str) // ---------------------------------------------------------------------------- // forward decls @@ -600,12 +600,12 @@ inline const wxString& wxGetTranslation(const wxString& str1, #if !defined(WXINTL_NO_GETTEXT_MACRO) #if !defined(_) - #define _(s) (_T(s)) + #define _(s) (s) #endif - #define wxPLURAL(sing, plur, n) ((n) == 1 ? _T(sing) : _T(plur)) + #define wxPLURAL(sing, plur, n) ((n) == 1 ? (sing) : (plur)) #endif -#define wxTRANSLATE(str) _T(str) +#define wxTRANSLATE(str) (str) // NB: we use a template here in order to avoid using // wxLocale::GetUntranslatedString() above, which would be required if @@ -635,10 +635,10 @@ inline TString wxGetTranslation(TString str1, TString str2, size_t n, // wxTRANSLATE) too #if !defined(WXINTL_NO_GETTEXT_MACRO) #if !defined(gettext_noop) - #define gettext_noop(str) _T(str) + #define gettext_noop(str) (str) #endif #if !defined(N_) - #define N_(s) _T(s) + #define N_(s) (s) #endif #endif -- 2.45.2