Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fixes to wxLocale::GetSystemLanguage(), test code for it added to the console sample

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-03-21 19:07:23 +00:00
parent cf1eeea343
commit ec37df5776
3 changed files with 470 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/intl.h
View File

@@ -42,6 +42,7 @@
// ----------------------------------------------------------------------------
// forward decls
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxLocale;
class WXDLLEXPORT wxMsgCatalog;
class WXDLLEXPORT wxLanguageInfoArray;
@@ -50,7 +51,6 @@ class WXDLLEXPORT wxLanguageInfoArray;
// locale support
// ============================================================================
// ----------------------------------------------------------------------------
// wxLanguage: defines all supported languages
// ----------------------------------------------------------------------------
@@ -62,6 +62,7 @@ enum wxLanguage
{
// user's default/preffered language as got from OS:
wxLANGUAGE_DEFAULT,
// unknown language, if wxLocale::GetSystemLanguage fails:
wxLANGUAGE_UNKNOWN,
@@ -313,9 +314,6 @@ struct WXDLLEXPORT wxLanguageInfo
wxString Description; // human-readable name of the language
};
// ----------------------------------------------------------------------------
// wxLocale: encapsulates all language dependent settings, including current
// message catalogs, date, time and currency formats (TODO) &c
@@ -347,7 +345,7 @@ public:
Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding);
}
wxLocale(int language, // wxLanguage identifier
wxLocale(int language, // wxLanguage id or custom language
int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING)
{ Init(language, flags); }
@@ -358,14 +356,15 @@ public:
bool bLoadDefault = TRUE,
bool bConvertEncoding = FALSE);
// same as second ctor (returns TRUE on success)
bool Init(int language = wxLANGUAGE_DEFAULT,
int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
// restores old locale
~wxLocale();
// Try to get user's (or OS's) prefered language setting.
// Return wxLanguage value or wxLANGUAGE_UNKNOWN if language-guessing
// algorithm failed
// Return wxLANGUAGE_UNKNOWN if language-guessing algorithm failed
int GetSystemLanguage() const;
// return TRUE if the locale was set successfully