Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-22 14:20:35 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Define wxPLURAL regardless of WXINTL_NO_GETTEXT_MACRO

Browse Source 
The purpose of WXINTL_NO_GETTEXT_MACRO is, as I understand it, to avoid
name clashes between _() and symbols with the same name introduced by
other libraries or compilers.

Although wxPLURAL has forever (15d0695 (added wxPLURAL() macro,
2005-06-01)) been conditionally defined, there is no similar need with it.
wxPLURAL has a longer name, and is wx-prefixed. The other, more recently
introduced translation macros are not conditionally defined, which makes
wxPLURAL inconsistent in this regard.

Closes #24943.
This commit is contained in:
Lauri Nurmi
2024-11-10 15:53:47 +01:00
committed by Vadim Zeitlin
parent b3751da48c
commit fd28beb2fa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/wx/translation.h
+2 -1
View File
@@ -50,9 +50,10 @@ using wxTranslationsHashMap = std::unordered_map<wxString, wxString>;
#else
#define _(s) wxGetTranslation(wxASCII_STR(s))
#endif
#define wxPLURAL(sing, plur, n) wxGetTranslation((sing), (plur), n)
#endif
#define wxPLURAL(sing, plur, n) wxGetTranslation((sing), (plur), n)
// wx-specific macro for translating strings in the given context: if you use
// them, you need to also add
// --keyword="wxGETTEXT_IN_CONTEXT:1c,2" --keyword="wxGETTEXT_IN_CONTEXT_PLURAL:1c,2,3"