replace wxLANGUAGE_DEFAULT with GetSystemLanguage() result in GetLanguageInfo()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/locale.tex b/docs/latex/wx/locale.tex
index bbde7a7a65155897a0b6e06f1edba24729e9d17c..a75e762e7bdc4d7f51845ca754f2d5b67b8d032c 100644 (file)
--- a/docs/latex/wx/locale.tex
+++ b/docs/latex/wx/locale.tex
@@ -59,6 +59,7 @@ No base class
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 

+

 \membersection{Supported languages}\label{wxlanguage}
 
 The following wxLanguage constants may be used to specify the language
 \membersection{Supported languages}\label{wxlanguage}
 
 The following wxLanguage constants may be used to specify the language


@@ -312,6 +313,7 @@ this
 
 
 
 
 
 

+

 \membersection{wxLocale::wxLocale}\label{wxlocaledefctor}
 
 \func{}{wxLocale}{\void}
 \membersection{wxLocale::wxLocale}\label{wxlocaledefctor}
 
 \func{}{wxLocale}{\void}


@@ -336,6 +338,7 @@ application and so all subsequent calls to wxGetTranslation() will try to
 translate the messages using the message catalogs for this locale.
 
 
 translate the messages using the message catalogs for this locale.
 
 

+

 \membersection{wxLocale::\destruct{wxLocale}}\label{wxlocaledtor}
 
 \func{}{\destruct{wxLocale}}{\void}
 \membersection{wxLocale::\destruct{wxLocale}}\label{wxlocaledtor}
 
 \func{}{\destruct{wxLocale}}{\void}


@@ -344,6 +347,7 @@ The destructor, like the constructor, also has global side effects: the previous
 set locale is restored and so the changes described in 
 \helpref{Init}{wxlocaleinit} documentation are rolled back.
 
 set locale is restored and so the changes described in 
 \helpref{Init}{wxlocaleinit} documentation are rolled back.
 

+

 \membersection{wxLocale::AddCatalog}\label{wxlocaleaddcatalog}
 
 \func{bool}{AddCatalog}{\param{const char }{*szDomain}}
 \membersection{wxLocale::AddCatalog}\label{wxlocaleaddcatalog}
 
 \func{bool}{AddCatalog}{\param{const char }{*szDomain}}


@@ -384,6 +388,7 @@ If you have to deal with non-English strings or 8-bit characters in the source
 code, see the instructions in 
 \helpref{Writing non-English applications}{nonenglishoverview}.
 
 code, see the instructions in 
 \helpref{Writing non-English applications}{nonenglishoverview}.
 

+

 \membersection{wxLocale::AddCatalogLookupPathPrefix}\label{wxlocaleaddcataloglookuppathprefix}
 
 \func{void}{AddCatalogLookupPathPrefix}{\param{const wxString\& }{prefix}}
 \membersection{wxLocale::AddCatalogLookupPathPrefix}\label{wxlocaleaddcataloglookuppathprefix}
 
 \func{void}{AddCatalogLookupPathPrefix}{\param{const wxString\& }{prefix}}


@@ -394,6 +399,7 @@ looked up under prefix/<lang>/LC\_MESSAGES, prefix/LC\_MESSAGES and prefix
 
 This only applies to subsequent invocations of AddCatalog()!
 
 
 This only applies to subsequent invocations of AddCatalog()!
 

+

 \membersection{wxLocale::AddLanguage}\label{wxlocaleaddlanguage}
 
 \func{static void}{AddLanguage}{\param{const wxLanguageInfo\& }{info}}
 \membersection{wxLocale::AddLanguage}\label{wxlocaleaddlanguage}
 
 \func{static void}{AddLanguage}{\param{const wxLanguageInfo\& }{info}}


@@ -423,6 +429,7 @@ struct WXDLLEXPORT wxLanguageInfo
 \perlnote{In wxPerl Wx::LanguageInfo has only one method:\par
 Wx::LanguageInfo->new( language, canonicalName, WinLang, WinSubLang, Description )}
 
 \perlnote{In wxPerl Wx::LanguageInfo has only one method:\par
 Wx::LanguageInfo->new( language, canonicalName, WinLang, WinSubLang, Description )}
 

+

 \membersection{wxLocale::FindLanguageInfo}{wxlocalefindlanguageinfo}
 
 \constfunc{static wxLanguageInfo *}{FindLanguageInfo}{\param{const wxString\& }{locale}}
 \membersection{wxLocale::FindLanguageInfo}{wxlocalefindlanguageinfo}
 
 \constfunc{static wxLanguageInfo *}{FindLanguageInfo}{\param{const wxString\& }{locale}}


@@ -440,6 +447,7 @@ is unknown. Note that even if the returned pointer is valid, the caller should
 
 \helpref{GetLanguageInfo}{wxlocalegetlanguageinfo}
 
 
 \helpref{GetLanguageInfo}{wxlocalegetlanguageinfo}
 

+

 \membersection{wxLocale::GetCanonicalName}\label{wxlocalegetcanonicalname}
 
 \constfunc{wxString}{GetSysName}{\void}
 \membersection{wxLocale::GetCanonicalName}\label{wxlocalegetcanonicalname}
 
 \constfunc{wxString}{GetSysName}{\void}


@@ -455,6 +463,7 @@ Compare \helpref{GetSysName}{wxlocalegetsysname}.
 
 
 
 
 
 

+

 \membersection{wxLocale::GetLanguage}\label{wxlocalegetlanguage}
 
 \constfunc{int}{GetLanguage}{\void}
 \membersection{wxLocale::GetLanguage}\label{wxlocalegetlanguage}
 
 \constfunc{int}{GetLanguage}{\void}


@@ -463,6 +472,7 @@ Returns \helpref{wxLanguage}{wxlanguage} constant of current language.
 Note that you can call this function only if you used the form of
 \helpref{Init}{wxlocaleinit} that takes wxLanguage argument.
 
 Note that you can call this function only if you used the form of
 \helpref{Init}{wxlocaleinit} that takes wxLanguage argument.
 

+

 \membersection{wxLocale::GetLanguageInfo}\label{wxlocalegetlanguageinfo}
 
 \constfunc{static wxLanguageInfo *}{GetLanguageInfo}{\param{int }{lang}}
 \membersection{wxLocale::GetLanguageInfo}\label{wxlocalegetlanguageinfo}
 
 \constfunc{static wxLanguageInfo *}{GetLanguageInfo}{\param{int }{lang}}


@@ -474,6 +484,11 @@ returned pointer is valid, the caller should {\it not} delete it.
 See \helpref{AddLanguage}{wxlocaleaddlanguage} for the wxLanguageInfo
 description.
 
 See \helpref{AddLanguage}{wxlocaleaddlanguage} for the wxLanguageInfo
 description.
 

+As with \helpref{Init}{wxlocaleinit}, \texttt{wxLANGUAGE\_DEFAULT} has the
+special meaning if passed as an argument to this function and in this case the
+result of \helpref{GetSystemLanguage()}{wxlocalegetsystemlanguage} is used.
+
+

 \membersection{wxLocale::GetLanguageName}\label{wxlocalegetlanguagename}
 
 \constfunc{static wxString}{GetLanguageName}{\param{int }{lang}}
 \membersection{wxLocale::GetLanguageName}\label{wxlocalegetlanguagename}
 
 \constfunc{static wxString}{GetLanguageName}{\param{int }{lang}}


@@ -481,6 +496,9 @@ description.
 Returns English name of the given language or empty string if this
 language is unknown.
 
 Returns English name of the given language or empty string if this
 language is unknown.
 

+See \helpref{GetLanguageInfo}{wxlocalegetlanguageinfo} for a remark about
+special meaning of \texttt{wxLANGUAGE\_DEFAULT}.
+

 
 \membersection{wxLocale::GetLocale}\label{wxlocalegetlocale}
 
 
 \membersection{wxLocale::GetLocale}\label{wxlocalegetlocale}
 


@@ -491,6 +509,7 @@ Returns the locale name as passed to the constructor or
 e.g. "English" or "French".
 
 
 e.g. "English" or "French".
 
 

+

 \membersection{wxLocale::GetName}\label{wxlocalegetname}
 
 \constfunc{const wxString\&}{GetName}{\void}
 \membersection{wxLocale::GetName}\label{wxlocalegetname}
 
 \constfunc{const wxString\&}{GetName}{\void}


@@ -498,6 +517,7 @@ e.g. "English" or "French".
 Returns the current short name for the locale (as given to the constructor or
 the Init() function).
 
 Returns the current short name for the locale (as given to the constructor or
 the Init() function).
 

+

 \membersection{wxLocale::GetString}\label{wxlocalegetstring}
 
 \constfunc{const char*}{GetString}{\param{const char }{*szOrigString}, \param{const char }{*szDomain = NULL}}
 \membersection{wxLocale::GetString}\label{wxlocalegetstring}
 
 \constfunc{const char*}{GetString}{\param{const char }{*szOrigString}, \param{const char }{*szDomain = NULL}}


@@ -530,6 +550,7 @@ function and \helpref{\_()}{underscore} macro.
 Domains are searched in the last to first order, i.e. catalogs
 added later override those added before.
 
 Domains are searched in the last to first order, i.e. catalogs
 added later override those added before.
 

+

 \membersection{wxLocale::GetSysName}\label{wxlocalegetsysname}
 
 \constfunc{wxString}{GetSysName}{\void}
 \membersection{wxLocale::GetSysName}\label{wxlocalegetsysname}
 
 \constfunc{wxString}{GetSysName}{\void}


@@ -539,6 +560,7 @@ Returns current platform-specific locale name as passed to setlocale().
 Compare \helpref{GetCanonicalName}{wxlocalegetcanonicalname}.
 
 
 Compare \helpref{GetCanonicalName}{wxlocalegetcanonicalname}.
 
 

+

 \membersection{wxLocale::GetSystemEncoding}\label{wxlocalegetsystemencoding}
 
 \constfunc{static wxFontEncoding}{GetSystemEncoding}{\void}
 \membersection{wxLocale::GetSystemEncoding}\label{wxlocalegetsystemencoding}
 
 \constfunc{static wxFontEncoding}{GetSystemEncoding}{\void}


@@ -547,6 +569,7 @@ Tries to detect the user's default font encoding.
 Returns \helpref{wxFontEncoding}{wxfont} value or 
 {\bf wxFONTENCODING\_SYSTEM} if it couldn't be determined.
 
 Returns \helpref{wxFontEncoding}{wxfont} value or 
 {\bf wxFONTENCODING\_SYSTEM} if it couldn't be determined.
 

+

 \membersection{wxLocale::GetSystemEncodingName}\label{wxlocalegetsystemencodingname}
 
 \constfunc{static wxString}{GetSystemEncodingName}{\void}
 \membersection{wxLocale::GetSystemEncodingName}\label{wxlocalegetsystemencodingname}
 
 \constfunc{static wxString}{GetSystemEncodingName}{\void}


@@ -559,6 +582,7 @@ so you should probably use
 Returns a user-readable string value or an empty string if it couldn't be
 determined.
 
 Returns a user-readable string value or an empty string if it couldn't be
 determined.
 

+

 \membersection{wxLocale::GetSystemLanguage}\label{wxlocalegetsystemlanguage}
 
 \constfunc{static int}{GetSystemLanguage}{\void}
 \membersection{wxLocale::GetSystemLanguage}\label{wxlocalegetsystemlanguage}
 
 \constfunc{static int}{GetSystemLanguage}{\void}


@@ -568,6 +592,7 @@ Returns \helpref{wxLanguage}{wxlanguage} value or
  {\bf wxLANGUAGE\_UNKNOWN} if the language-guessing algorithm failed.
 
 
  {\bf wxLANGUAGE\_UNKNOWN} if the language-guessing algorithm failed.
 
 

+

 \membersection{wxLocale::Init}\label{wxlocaleinit}
 
 
 \membersection{wxLocale::Init}\label{wxlocaleinit}
 
 


@@ -631,6 +656,7 @@ translate the messages using the message catalogs for this locale.
 
 Returns true on success or false if the given locale couldn't be set.
 
 
 Returns true on success or false if the given locale couldn't be set.
 

+

 \membersection{wxLocale::IsLoaded}\label{wxlocaleisloaded}
 
 \constfunc{bool}{IsLoaded}{\param{const char* }{domain}}
 \membersection{wxLocale::IsLoaded}\label{wxlocaleisloaded}
 
 \constfunc{bool}{IsLoaded}{\param{const char* }{domain}}


@@ -642,6 +668,7 @@ normally corresponds to 'domain' which is more or less the application name.
 
 See also: \helpref{AddCatalog}{wxlocaleaddcatalog}
 
 
 See also: \helpref{AddCatalog}{wxlocaleaddcatalog}
 

+

 \membersection{wxLocale::IsOk}\label{wxlocaleisok}
 
 \constfunc{bool}{IsOk}{\void}
 \membersection{wxLocale::IsOk}\label{wxlocaleisok}
 
 \constfunc{bool}{IsOk}{\void}

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 6f974e5e4be4d87a9df629abc7c11ac9a1ef3a6d..317cc06e042271012e75aaf3fa1a835af4995f49 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -2339,6 +2339,11 @@ const wxLanguageInfo *wxLocale::GetLanguageInfo(int lang)
 {
     CreateLanguagesDB();
 
 {
     CreateLanguagesDB();
 

+    // calling GetLanguageInfo(wxLANGUAGE_DEFAULT) is a natural thing to do, so
+    // make it work
+    if ( lang == wxLANGUAGE_DEFAULT )
+        lang = GetSystemLanguage();
+

     const size_t count = ms_languagesDB->GetCount();
     for ( size_t i = 0; i < count; i++ )
     {
     const size_t count = ms_languagesDB->GetCount();
     for ( size_t i = 0; i < count; i++ )
     {