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

use more wxOVERRIDE (#329)

Browse Source
This commit is contained in:
Maarten
2016-09-25 22:21:28 +02:00
committed by paulcor
parent d0c57dbef0
commit 977a826639
66 changed files with 456 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/strconv.cpp
View File

@@ -2569,7 +2569,7 @@ public:
}
#endif // wxUSE_FONTMAP
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const wxOVERRIDE
{
// note that we have to use MB_ERR_INVALID_CHARS flag as it without it
// the behaviour is not compatible with the Unix version (using iconv)
@@ -2608,7 +2608,7 @@ public:
return len - 1;
}
virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const
virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const wxOVERRIDE
{
/*
We need to WC_NO_BEST_FIT_CHARS to prevent WideCharToMultiByte()
@@ -2693,7 +2693,7 @@ public:
return len - 1;
}
virtual size_t GetMBNulLen() const
virtual size_t GetMBNulLen() const wxOVERRIDE
{
if ( m_minMBCharWidth == 0 )
{
@@ -2732,7 +2732,7 @@ public:
return m_minMBCharWidth;
}
virtual wxMBConv *Clone() const { return new wxMBConv_win32(*this); }
virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_win32(*this); }
bool IsOk() const { return m_CodePage != -1; }