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

Always enable wxMBConv::IsUTF8()

Browse Source 
These where previously guarded by wxUSE_UNICODE_UTF8 but
may be useful in other configurations too.
This commit is contained in:
Tobias Taschner
2017-10-27 19:57:51 +02:00
parent 0cb55df404
commit 73a22766ee
5 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/strconv.cpp
View File

@@ -2128,9 +2128,7 @@ public:
const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
virtual size_t GetMBNulLen() const wxOVERRIDE;
#if wxUSE_UNICODE_UTF8
virtual bool IsUTF8() const wxOVERRIDE;
#endif
virtual wxMBConv *Clone() const wxOVERRIDE
{
@@ -2516,13 +2514,11 @@ size_t wxMBConv_iconv::GetMBNulLen() const
return m_minMBCharWidth;
}
#if wxUSE_UNICODE_UTF8
bool wxMBConv_iconv::IsUTF8() const
{
return wxStricmp(m_name, "UTF-8") == 0 ||
wxStricmp(m_name, "UTF8") == 0;
}
#endif
#endif // HAVE_ICONV
@@ -3250,7 +3246,6 @@ size_t wxCSConv::GetMBNulLen() const
return 1;
}
#if wxUSE_UNICODE_UTF8
bool wxCSConv::IsUTF8() const
{
if ( m_convReal )
@@ -3259,7 +3254,6 @@ bool wxCSConv::IsUTF8() const
// otherwise, we are ISO-8859-1
return false;
}
#endif
// ============================================================================