From 9d814be8d00ebf4f0fa1bf4537f246ef4396c776 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 19 Nov 2003 20:51:05 +0000 Subject: [PATCH] don't define ngettext, causes problems git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/intl.h | 6 +----- samples/internat/internat.cpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/wx/intl.h b/include/wx/intl.h index 56e21256a9..5347ebf0de 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -33,11 +33,10 @@ // ---------------------------------------------------------------------------- // gettext() style macros (notice that xgettext should be invoked with -// --keyword="_" --keyword="ngettext:1,2" options +// --keyword="_" --keyword="wxGetTranslation:1,2" options // to extract the strings from the sources) #ifndef WXINTL_NO_GETTEXT_MACRO #define _(s) wxGetTranslation(_T(s)) - #define ngettext(s1, s2, n) wxGetTranslation(_T(s1), _T(s2), n) #endif // another one which just marks the strings for extraction, but doesn't @@ -560,9 +559,6 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2, #if !defined(_) #define _(s) (_T(s)) #endif - #if !defined(ngettext) - #define ngettext(s1, s2, n) ((n) == 1 ? _T(s1) : _T(s2)) - #endif #endif #define wxTRANSLATE(str) _T(str) diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index acdc2ccdcb..1bf57ba9a4 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -349,7 +349,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) for (int n = first; n <= last; ++n) { s << n << _T(" ") << - ngettext("file deleted", "files deleted", n) << _T("\n"); + wxGetTranslation("file deleted", "files deleted", n) << _T("\n"); } wxMessageBox(s); } -- 2.45.2