X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d28a1f9271606b5a38b4b7b2a78bd869bb7d520..e733c4ce1e24cf7e4b0b0d8362fc59aaa7a7641c:/include/wx/intl.h

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 54d18a45d5..fea4d2d65b 100644
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -5,7 +5,6 @@
 // Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
 //              (2003/09/30 - plural forms support)
 // Created:     29/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -60,17 +59,17 @@ struct WXDLLIMPEXP_BASE wxLanguageInfo
 {
     int Language;                   // wxLanguage id
     wxString CanonicalName;         // Canonical name, e.g. fr_FR
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     wxUint32 WinLang,               // Win32 language identifiers
              WinSublang;
-#endif // __WXMSW__
+#endif // __WINDOWS__
     wxString Description;           // human-readable name of the language
     wxLayoutDirection LayoutDirection;
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     // return the LCID corresponding to this language
     wxUint32 GetLCID() const;
-#endif // __WXMSW__
+#endif // __WINDOWS__
 
     // return the locale name corresponding to this language usable with
     // setlocale() on the current system
@@ -79,9 +78,9 @@ struct WXDLLIMPEXP_BASE wxLanguageInfo
 
 // for Unix systems GetLocaleName() is trivial so implement it inline here, for
 // MSW it's implemented in intl.cpp
-#ifndef __WXMSW__
+#ifndef __WINDOWS__
 inline wxString wxLanguageInfo::GetLocaleName() const { return CanonicalName; }
-#endif // !__WXMSW__
+#endif // !__WINDOWS__
 
 
 // ----------------------------------------------------------------------------
@@ -302,18 +301,12 @@ public:
     // plural form version of the same:
     const wxString& GetString(const wxString& origString,
                               const wxString& origString2,
-                              size_t n,
+                              unsigned n,
                               const wxString& domain = wxEmptyString) const
     {
         return wxGetTranslation(origString, origString2, n, domain);
     }
 
-    // this is hack to work around a problem with wxGetTranslation() which
-    // returns const wxString& and not wxString, so when it returns untranslated
-    // string, it needs to have a copy of it somewhere
-    static const wxString& GetUntranslatedString(const wxString& str)
-        { return wxTranslations::GetUntranslatedString(str); }
-
     // Returns the current short name for the locale
     const wxString& GetName() const { return m_strShort; }