X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba9d03fa1316bfa8cd555fc3128f90663f78db99..ffafd8a55bb0b8fb4236e4522792a6b143813609:/include/wx/intl.h?ds=inline diff --git a/include/wx/intl.h b/include/wx/intl.h index 56e21256a9..c784562899 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 @@ -521,6 +520,8 @@ private: bool m_bConvertEncoding; + bool m_initialized; + static wxLanguageInfoArray *ms_languagesDB; DECLARE_NO_COPY_CLASS(wxLocale) @@ -560,9 +561,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)