Add files necessary to run Expat configure.

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

diff --git a/interface/wx/intl.h b/interface/wx/intl.h
index c0854e4337ff2f86bd859cb478e54570176c1afe..ca4587ae8ff7b1ddef512abbfb3afb46a302ef24 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$
 // 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
     related to that language.
 
     @beginWxPerlOnly


@@ -27,7 +27,7 @@ enum wxLayoutDirection
     - Wx::LanguageInfo->new(language, canonicalName, WinLang, WinSubLang, Description)
     @endWxPerlOnly
 */
     - 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
 {
     /// ::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,
         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);
 
              const wxString& locale = wxEmptyString,
              bool bLoadDefault = true);
 


@@ -391,10 +391,17 @@ public:
     static wxString GetSystemEncodingName();
 
     /**
     static wxString GetSystemEncodingName();
 
     /**

-        Tries to detect the user's default language setting.
+        Tries to detect the user's default locale setting.

 
         Returns the ::wxLanguage value or @c wxLANGUAGE_UNKNOWN if the language-guessing
         algorithm failed.
 
         Returns the ::wxLanguage value or @c wxLANGUAGE_UNKNOWN if the language-guessing
         algorithm failed.

+
+        @note This function works with @em locales and returns the user's default
+              locale. This may be, and usually is, the same as their preferred UI
+              language, but it's not the same thing. Use wxTranslation to obtain
+              @em language information.
+
+        @see wxTranslations::GetBestTranslation().

     */
     static int GetSystemLanguage();
 
     */
     static int GetSystemLanguage();
 


@@ -459,7 +466,7 @@ public:
             given locale containing the translations of standard wxWidgets messages.
             This parameter would be rarely used in normal circumstances.
     */
             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);
 
     /**
               const wxString& locale = wxEmptyString, bool bLoadDefault = true);
 
     /**