X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beb59f36c016d27cf8949eb8c0d38fc63ad536a..da75a14e72a6455df1f580afd694070c4467449e:/include/wx/intl.h diff --git a/include/wx/intl.h b/include/wx/intl.h index 87c60ae32f..3e523ec95f 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -13,10 +13,6 @@ #ifndef _WX_INTL_H_ #define _WX_INTL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "intl.h" -#endif - #include "wx/defs.h" #include "wx/string.h" @@ -33,10 +29,11 @@ // ---------------------------------------------------------------------------- // gettext() style macros (notice that xgettext should be invoked with -// --keyword="_" --keyword="wxGetTranslation:1,2" options +// --keyword="_" --keyword="wxPLURAL:1,2" options // to extract the strings from the sources) #ifndef WXINTL_NO_GETTEXT_MACRO - #define _(s) wxGetTranslation(_T(s)) + #define _(s) wxGetTranslation(_T(s)) + #define wxPLURAL(sing, plur, n) wxGetTranslation(_T(sing), _T(plur), n) #endif // another one which just marks the strings for extraction, but doesn't @@ -378,7 +375,7 @@ public: const wxChar *szShort = (const wxChar *) NULL, // dir prefix (for msg files) const wxChar *szLocale = (const wxChar *) NULL, // locale (for setlocale) bool bLoadDefault = true, // preload wxstd.mo? - bool bConvertEncoding = false) // convert Win<->Unix if neccessary? + bool bConvertEncoding = false) // convert Win<->Unix if necessary? { DoCommonInit(); @@ -407,7 +404,7 @@ public: // restores old locale ~wxLocale(); - // Try to get user's (or OS's) prefered language setting. + // Try to get user's (or OS's) preferred language setting. // Return wxLANGUAGE_UNKNOWN if language-guessing algorithm failed static int GetSystemLanguage();