Add NUM_CUSTOM

[wxWidgets.git] / interface / wx / intl.h

diff --git a/interface/wx/intl.h b/interface/wx/intl.h
index 359a5dfcdc41899dcc83c1d7532510e4e0e0728f..85264edfdff441ddf0d6ff00ef044f06cea7dc32 100644 (file)
--- a/interface/wx/intl.h
+++ b/interface/wx/intl.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxLocale
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -19,7 +19,7 @@ enum wxLayoutDirection
 };
 
 /**
-    Encapsulates a ::wxLanguage indentifier together with OS-specific information
+    Encapsulates a ::wxLanguage identifier together with OS-specific information
     related to that language.
 
     @beginWxPerlOnly
@@ -27,7 +27,7 @@ enum wxLayoutDirection
     - Wx::LanguageInfo->new(language, canonicalName, WinLang, WinSubLang, Description)
     @endWxPerlOnly
 */
-struct WXDLLIMPEXP_BASE wxLanguageInfo
+struct wxLanguageInfo
 {
     /// ::wxLanguage id.
     /// It should be greater than @c wxLANGUAGE_USER_DEFINED when defining your own
@@ -235,7 +235,7 @@ public:
         translate the messages using the message catalogs for this locale.
     */
     wxLocale(const wxString& name,
-             const wxString& short = wxEmptyString,
+             const wxString& shortName = wxEmptyString,
              const wxString& locale = wxEmptyString,
              bool bLoadDefault = true);
 
@@ -361,10 +361,10 @@ public:
                                       const wxString& domain = wxEmptyString) const;
 
     /**
-        Calls wxTranslations::GetString(const wxString&, const wxString&, size_t, const wxString&) const.
+        Calls wxTranslations::GetString(const wxString&, const wxString&, unsigned, const wxString&) const.
     */
     virtual const wxString& GetString(const wxString& origString,
-                                      const wxString& origString2, size_t n,
+                                      const wxString& origString2, unsigned n,
                                       const wxString& domain = wxEmptyString) const;
 
     /**
@@ -459,7 +459,7 @@ public:
             given locale containing the translations of standard wxWidgets messages.
             This parameter would be rarely used in normal circumstances.
     */
-    bool Init(const wxString& name, const wxString& short = wxEmptyString,
+    bool Init(const wxString& name, const wxString& shortName = wxEmptyString,
               const wxString& locale = wxEmptyString, bool bLoadDefault = true);
 
     /**