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

don't define ngettext, causes problems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-11-19 20:51:05 +00:00
parent 6b9a6d772b
commit 9d814be8d0
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/intl.h
View File

@@ -33,11 +33,10 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// gettext() style macros (notice that xgettext should be invoked with // 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) // to extract the strings from the sources)
#ifndef WXINTL_NO_GETTEXT_MACRO #ifndef WXINTL_NO_GETTEXT_MACRO
#define _(s) wxGetTranslation(_T(s)) #define _(s) wxGetTranslation(_T(s))
#define ngettext(s1, s2, n) wxGetTranslation(_T(s1), _T(s2), n)
#endif #endif
// another one which just marks the strings for extraction, but doesn't // 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(_) #if !defined(_)
#define _(s) (_T(s)) #define _(s) (_T(s))
#endif #endif
#if !defined(ngettext)
#define ngettext(s1, s2, n) ((n) == 1 ? _T(s1) : _T(s2))
#endif
#endif #endif
#define wxTRANSLATE(str) _T(str) #define wxTRANSLATE(str) _T(str)

2
samples/internat/internat.cpp
View File

@@ -349,7 +349,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
for (int n = first; n <= last; ++n) for (int n = first; n <= last; ++n)
{ {
s << n << _T(" ") << s << n << _T(" ") <<
ngettext("file deleted", "files deleted", n) << _T("\n"); wxGetTranslation("file deleted", "files deleted", n) << _T("\n");
} }
wxMessageBox(s); wxMessageBox(s);
} }