Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/interface/wx/intl.h b/interface/wx/intl.h
index 85264edfdff441ddf0d6ff00ef044f06cea7dc32..e34f200bac71b8e6d1f87de6571912964ef8dacc 100644 (file)
--- a/interface/wx/intl.h
+++ b/interface/wx/intl.h
@@ -2,7 +2,6 @@
 // Name:        intl.h
 // Purpose:     interface of wxLocale
 // Author:      wxWidgets team
 // Name:        intl.h
 // Purpose:     interface of wxLocale
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -391,10 +390,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();
 


@@ -448,7 +454,7 @@ public:
 
         @param name
             The name of the locale. Only used in diagnostic messages.
 
         @param name
             The name of the locale. Only used in diagnostic messages.

-        @param short
+        @param shortName

             The standard 2 letter locale abbreviation; it is used as the
             directory prefix when looking for the message catalog files.
         @param locale
             The standard 2 letter locale abbreviation; it is used as the
             directory prefix when looking for the message catalog files.
         @param locale