X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2a139adfdd96a0f781cbc013daff122aa23bba2..5a224901b8ede55e1db9980f0fcaf7d2cb49285f:/include/wx/intl.h diff --git a/include/wx/intl.h b/include/wx/intl.h index d1f9408f4f..879f26be45 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -347,7 +347,7 @@ enum wxLocaleInfo wxLOCALE_THOUSANDS_SEP, // the character used as decimal point - wxLOCALE_DECIMAL_POINT, + wxLOCALE_DECIMAL_POINT }; @@ -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