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

rewrote wxLocale to work in Unicode mode and support charsets better

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-15 23:28:15 +00:00
parent 98f2b8145f
commit 563d535e46
2 changed files with 257 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/intl.h
View File

@@ -465,8 +465,8 @@ public:
//
// domains are searched in the last to first order, i.e. catalogs
// added later override those added before.
const wxMB2WXbuf GetString(const wxChar *szOrigString,
const wxChar *szDomain = (const wxChar *) NULL) const;
const wxChar *GetString(const wxChar *szOrigString,
const wxChar *szDomain = (const wxChar *) NULL) const;
// Returns the current short name for the locale
const wxString& GetName() const { return m_strShort; }
@@ -507,13 +507,13 @@ private:
extern WXDLLEXPORT wxLocale* wxGetLocale();
// get the translation of the string in the current locale
inline const wxMB2WXbuf wxGetTranslation(const wxChar *sz)
inline const wxChar *wxGetTranslation(const wxChar *sz)
{
wxLocale *pLoc = wxGetLocale();
if (pLoc)
return pLoc->GetString(sz);
else
return (const wxMB2WXbuf)sz;
return sz;
}
#else // !wxUSE_INTL